[MOV] l10n_* : Re-organized directory structure

[MOV] l10n_ae : Re-organized directory structure.

[MOV] l10n_ar : Re-organized directory structure.

[MOV] l10n_at : Re-organized directory structure.

[MOV] l10n_au : Re-organized directory structure.

[MOV] l10n_be : Re-organized directory structure.

[MOV] l10n_bo : Re-organized directory structure.

[MOV] l10n_br : Re-organized directory structure.

[MOV] l10n_ca : Re-organized directory structure.

[MOV] l10n_ch : Re-organized directory structure.

[MOV] l10n_cl : Re-organized directory structure.

[MOV] l10n_cn : Re-organized directory structure.

[MOV] l10n_co : Re-organized directory structure.

[MOV] l10n_cr : Re-organized directory structure.

[MOV] l10n_de : Re-organized directory structure.

[MOV] l10n_de_skr03 : Re-organized directory structure.

[MOV] l10n_de_skr04 : Re-organized directory structure.

[MOV] l10n_cn_small_business : Re-organized directory structure.

[MOV] l10n_cn_standard : Re-organized directory structure.

[MOV] l10n_do : Re-organized directory structure.

[MOV] l10n_ec : Re-organized directory structure.

[MOV] l10n_es : Re-organized directory structure.

[MOV] l10n_et : Re-organized directory structure.

[MOV] l10n_fr : Re-organized directory structure.

[MOV] l10n_generic_coa : Re-organized directory structure.

[MOV] l10n_gr : Re-organized directory structure.

[MOV] l10n_gt : Re-organized directory structure.

[MOV] l10n_hn : Re-organized directory structure.

[MOV] l10n_hr : Re-organized directory structure.

[MOV] l10n_hu : Re-organized directory structure.

[MOV] l10n_in : Re-organized directory structure.

[MOV] l10n_it : Re-organized directory structure.

[MOV] l10n_jp : Re-organized directory structure.

[MOV] l10n_lu : Re-organized directory structure.

[MOV] l10n_ma : Re-organized directory structure.

[MOV] l10n_mx : Re-organized directory structure.

[MOV] l10n_nl : Re-organized directory structure.

[MOV] l10n_no : Re-organized directory structure.

[MOV] l10n_nz : Re-organized directory structure.

[MOV] l10n_pa : Re-organized directory structure.

[MOV] l10n_pe : Re-organized directory structure.

[MOV] l10n_pl : Re-organized directory structure.

[MOV] l10n_ro : Re-organized directory structure.

[MOV] l10n_sa : Re-organized directory structure.

[MOV] l10n_sg : Re-organized directory structure.

[MOV] l10n_si : Re-organized directory structure.

[MOV] l10n_syscohada : Re-organized directory structure.

[MOV] l10n_th : Re-organized directory structure.

[MOV] l10n_tr : Re-organized directory structure.

[MOV] l10n_uk : Re-organized directory structure.

[MOV] l10n_us : Re-organized directory structure.

[MOV] l10n_uy : Re-organized directory structure.

[MOV] l10n_ve : Re-organized directory structure.

[MOV] l10n_vn : Re-organized directory structure.

258 files changed, 219 insertions, 200 deletions

diff --git a/addons/l10n_ae/__openerp__.py b/addons/l10n_ae/__openerp__.py
index 337a4755be4..9ab2c34b79d 100644
--- a/addons/l10n_ae/__openerp__.py
+++ b/addons/l10n_ae/__openerp__.py
@@ -17,8 +17,8 @@ United Arab Emirates accounting chart and localization.
     'depends': ['base', 'account'],
     'demo': [ ],
     'data': [
-             'l10n_ae_chart.xml',
-             'account_chart_template.yml',
+             'data/l10n_ae_chart_data.xml',
+             'data/account_chart_template_data.yml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_ae/account_chart_template.yml b/addons/l10n_ae/data/account_chart_template_data.yml
index 21ba5335c3f..21ba5335c3f 100644
--- a/addons/l10n_ae/account_chart_template.yml
+++ b/addons/l10n_ae/data/account_chart_template_data.yml
diff --git a/addons/l10n_ae/l10n_ae_chart.xml b/addons/l10n_ae/data/l10n_ae_chart_data.xml
index 45d5b1347db..45d5b1347db 100644
--- a/addons/l10n_ae/l10n_ae_chart.xml
+++ b/addons/l10n_ae/data/l10n_ae_chart_data.xml
diff --git a/addons/l10n_ar/__openerp__.py b/addons/l10n_ar/__openerp__.py
index b0e6a222328..626ce65ff4c 100644
--- a/addons/l10n_ar/__openerp__.py
+++ b/addons/l10n_ar/__openerp__.py
@@ -18,9 +18,9 @@ Plan contable argentino e impuestos de acuerdo a disposiciones vigentes
     'category': 'Localization',
     'depends': ['base', 'account'],
     'data':[
-        'l10n_ar_chart.xml',
-        'account_tax.xml',
-        'account_chart_template.yml',
+        'data/l10n_ar_chart_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'active': False,
diff --git a/addons/l10n_ar/account_chart_template.yml b/addons/l10n_ar/data/account_chart_template_data.yml
index 5b1449f3f35..5b1449f3f35 100644
--- a/addons/l10n_ar/account_chart_template.yml
+++ b/addons/l10n_ar/data/account_chart_template_data.yml
diff --git a/addons/l10n_ar/account_tax.xml b/addons/l10n_ar/data/account_tax_data.xml
index 1f337137925..1f337137925 100644
--- a/addons/l10n_ar/account_tax.xml
+++ b/addons/l10n_ar/data/account_tax_data.xml
diff --git a/addons/l10n_ar/l10n_ar_chart.xml b/addons/l10n_ar/data/l10n_ar_chart_data.xml
index 87d6438ca53..87d6438ca53 100644
--- a/addons/l10n_ar/l10n_ar_chart.xml
+++ b/addons/l10n_ar/data/l10n_ar_chart_data.xml
diff --git a/addons/l10n_at/__openerp__.py b/addons/l10n_at/__openerp__.py
index 0970bb4399f..6bc41de7bd3 100644
--- a/addons/l10n_at/__openerp__.py
+++ b/addons/l10n_at/__openerp__.py
@@ -16,7 +16,9 @@ This module provides the standard Accounting Chart for Austria which is based on
 Please keep in mind that you should review and adapt it with your Accountant, before using it in a live Environment.
 """,
     'demo': [],
-    'data': ['account_chart.xml', 'account_tax.xml', 'account_chart_template.yml'],
+    'data': ['data/l10n_at_chart_data.xml',
+             'data/account_tax_data.xml',
+             'data/account_chart_template_data.yml'],
     'auto_install': False,
     'installable': True
 }
diff --git a/addons/l10n_at/account_chart_template.yml b/addons/l10n_at/data/account_chart_template_data.yml
index 8c6159182db..8c6159182db 100644
--- a/addons/l10n_at/account_chart_template.yml
+++ b/addons/l10n_at/data/account_chart_template_data.yml
diff --git a/addons/l10n_at/account_tax.xml b/addons/l10n_at/data/account_tax_data.xml
index f80488fe1ea..f80488fe1ea 100644
--- a/addons/l10n_at/account_tax.xml
+++ b/addons/l10n_at/data/account_tax_data.xml
diff --git a/addons/l10n_at/account_chart.xml b/addons/l10n_at/data/l10n_at_chart_data.xml
index 8bc33d795cf..8bc33d795cf 100644
--- a/addons/l10n_at/account_chart.xml
+++ b/addons/l10n_at/data/l10n_at_chart_data.xml
diff --git a/addons/l10n_au/__openerp__.py b/addons/l10n_au/__openerp__.py
index 69041554d9b..51bfeaba6ae 100644
--- a/addons/l10n_au/__openerp__.py
+++ b/addons/l10n_au/__openerp__.py
@@ -21,14 +21,14 @@ Also:
     'website': 'http://www.willowit.com',
     'depends': ['account'],
     'data': [
-             'data/account_chart_template.xml',
+             'data/l10n_au_chart_data.xml',
              'data/account.account.template.csv',
-             'data/account_chart_template_refs.xml',
+             'data/account_chart_template_data.xml',
              'data/account.account.tag.csv',
              'data/account.tax.template.csv',
-             'data/account_fiscal_position_tax_template.xml',
-             'data/account_chart_template.yml',
-             'data/localisation.xml',
+             'data/account_fiscal_position_tax_template_data.xml',
+             'data/account_chart_template_data.yml',
+             'data/res_currency_data.xml',
              ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_au/data/account_chart_template_refs.xml b/addons/l10n_au/data/account_chart_template_data.xml
index 616d991a1ac..616d991a1ac 100644
--- a/addons/l10n_au/data/account_chart_template_refs.xml
+++ b/addons/l10n_au/data/account_chart_template_data.xml
diff --git a/addons/l10n_au/data/account_chart_template.yml b/addons/l10n_au/data/account_chart_template_data.yml
index 63dea9050ad..63dea9050ad 100644
--- a/addons/l10n_au/data/account_chart_template.yml
+++ b/addons/l10n_au/data/account_chart_template_data.yml
diff --git a/addons/l10n_au/data/account_fiscal_position_tax_template.xml b/addons/l10n_au/data/account_fiscal_position_tax_template_data.xml
index c02a0b71717..c02a0b71717 100644
--- a/addons/l10n_au/data/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_au/data/account_fiscal_position_tax_template_data.xml
diff --git a/addons/l10n_au/data/account_chart_template.xml b/addons/l10n_au/data/l10n_au_chart_data.xml
index 5f2f58c4efb..5f2f58c4efb 100644
--- a/addons/l10n_au/data/account_chart_template.xml
+++ b/addons/l10n_au/data/l10n_au_chart_data.xml
diff --git a/addons/l10n_au/data/localisation.xml b/addons/l10n_au/data/res_currency_data.xml
index 95647e09771..95647e09771 100644
--- a/addons/l10n_au/data/localisation.xml
+++ b/addons/l10n_au/data/res_currency_data.xml
diff --git a/addons/l10n_be/__openerp__.py b/addons/l10n_be/__openerp__.py
index 299f057234e..ef7ef642415 100644
--- a/addons/l10n_be/__openerp__.py
+++ b/addons/l10n_be/__openerp__.py
@@ -42,15 +42,15 @@ Wizards provided by this module:
         'l10n_multilang',
     ],
     'data': [
-        'account_chart_template.xml',
-        'account_pcmn_belgium.xml',
-        'account_tax_template.xml',
-        'l10n_be_sequence.xml',
-        'fiscal_templates.xml',
-        'account_fiscal_position_tax_template.xml',
-        'account_chart_template.yml',
+        'data/account_chart_template_data.xml',
+        'data/account_pcmn_belgium_data.xml',
+        'data/account_tax_template_data.xml',
+        'data/l10n_be_sequence_data.xml',
+        'data/fiscal_templates_data.xml',
+        'data/account_fiscal_position_tax_template_data.xml',
+        'data/account_chart_template_data.yml',
         'security/ir.model.access.csv',
-        'menuitem.xml'
+        'data/menuitem_data.xml'
     ],
     'demo': [
         'demo/l10n_be_demo.yml',
diff --git a/addons/l10n_be/account_chart_template.xml b/addons/l10n_be/data/account_chart_template_data.xml
index 50608ab0405..50608ab0405 100644
--- a/addons/l10n_be/account_chart_template.xml
+++ b/addons/l10n_be/data/account_chart_template_data.xml
diff --git a/addons/l10n_be/account_chart_template.yml b/addons/l10n_be/data/account_chart_template_data.yml
index 609acfedd29..609acfedd29 100644
--- a/addons/l10n_be/account_chart_template.yml
+++ b/addons/l10n_be/data/account_chart_template_data.yml
diff --git a/addons/l10n_be/account_fiscal_position_tax_template.xml b/addons/l10n_be/data/account_fiscal_position_tax_template_data.xml
index cb6df0384df..cb6df0384df 100644
--- a/addons/l10n_be/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_be/data/account_fiscal_position_tax_template_data.xml
diff --git a/addons/l10n_be/account_pcmn_belgium.xml b/addons/l10n_be/data/account_pcmn_belgium_data.xml
index e6cfd0def1f..e6cfd0def1f 100644
--- a/addons/l10n_be/account_pcmn_belgium.xml
+++ b/addons/l10n_be/data/account_pcmn_belgium_data.xml
diff --git a/addons/l10n_be/account_tax_template.xml b/addons/l10n_be/data/account_tax_template_data.xml
index 9a758df7404..9a758df7404 100644
--- a/addons/l10n_be/account_tax_template.xml
+++ b/addons/l10n_be/data/account_tax_template_data.xml
diff --git a/addons/l10n_be/fiscal_templates.xml b/addons/l10n_be/data/fiscal_templates_data.xml
index fa482443db5..fa482443db5 100644
--- a/addons/l10n_be/fiscal_templates.xml
+++ b/addons/l10n_be/data/fiscal_templates_data.xml
diff --git a/addons/l10n_be/l10n_be_sequence.xml b/addons/l10n_be/data/l10n_be_sequence_data.xml
index 8ce7eef4239..8ce7eef4239 100644
--- a/addons/l10n_be/l10n_be_sequence.xml
+++ b/addons/l10n_be/data/l10n_be_sequence_data.xml
diff --git a/addons/l10n_be/menuitem.xml b/addons/l10n_be/data/menuitem_data.xml
index 01c88e27600..01c88e27600 100644
--- a/addons/l10n_be/menuitem.xml
+++ b/addons/l10n_be/data/menuitem_data.xml
diff --git a/addons/l10n_bo/__openerp__.py b/addons/l10n_bo/__openerp__.py
index 25ee99e90d7..cd674db2d33 100644
--- a/addons/l10n_bo/__openerp__.py
+++ b/addons/l10n_bo/__openerp__.py
@@ -17,9 +17,9 @@ Plan contable boliviano e impuestos de acuerdo a disposiciones vigentes
     'category': 'Localization',
     "depends": ["account"],
     "data": [
-        "l10n_bo_chart.xml",
-        "account_tax.xml",
-        "account_chart_template.yml",
+        "data/l10n_bo_chart_data.xml",
+        "data/account_tax_data.xml",
+        "data/account_chart_template_data.yml",
     ],
     "installable": True,
 }
diff --git a/addons/l10n_bo/account_chart_template.yml b/addons/l10n_bo/data/account_chart_template_data.yml
index 270d83345be..270d83345be 100644
--- a/addons/l10n_bo/account_chart_template.yml
+++ b/addons/l10n_bo/data/account_chart_template_data.yml
diff --git a/addons/l10n_bo/account_tax.xml b/addons/l10n_bo/data/account_tax_data.xml
index 99ce50f47ba..99ce50f47ba 100644
--- a/addons/l10n_bo/account_tax.xml
+++ b/addons/l10n_bo/data/account_tax_data.xml
diff --git a/addons/l10n_bo/l10n_bo_chart.xml b/addons/l10n_bo/data/l10n_bo_chart_data.xml
index e52c1cd0284..e52c1cd0284 100644
--- a/addons/l10n_bo/l10n_bo_chart.xml
+++ b/addons/l10n_bo/data/l10n_bo_chart_data.xml
diff --git a/addons/l10n_br/__init__.py b/addons/l10n_br/__init__.py
index 6cfaaa7a3ae..8afc3410083 100644
--- a/addons/l10n_br/__init__.py
+++ b/addons/l10n_br/__init__.py
@@ -3,4 +3,4 @@
 
 # Copyright (C) 2009  Renato Lima - Akretion
 
-import account
+import models
diff --git a/addons/l10n_br/__openerp__.py b/addons/l10n_br/__openerp__.py
index a9a91f575dd..94f6c247908 100644
--- a/addons/l10n_br/__openerp__.py
+++ b/addons/l10n_br/__openerp__.py
@@ -48,11 +48,11 @@ come with any additional paid permission for online use of 'private modules'.
     'version': '1.0',
     'depends': ['account'],
     'data': [
-                'data/account_chart_template.xml',
+                'data/l10n_br_chart_data.xml',
                 'data/account.account.template.csv',
-                'data/account_tax_template.xml',
-                'account_view.xml',
-                'account_chart_template.yml',
+                'data/account_tax_template_data.xml',
+                'views/account_view.xml',
+                'data/account_chart_template_data.yml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_br/account_chart_template.yml b/addons/l10n_br/data/account_chart_template_data.yml
index 749b163b400..749b163b400 100644
--- a/addons/l10n_br/account_chart_template.yml
+++ b/addons/l10n_br/data/account_chart_template_data.yml
diff --git a/addons/l10n_br/data/account_tax_template.xml b/addons/l10n_br/data/account_tax_template_data.xml
index e3e2d85516a..e3e2d85516a 100644
--- a/addons/l10n_br/data/account_tax_template.xml
+++ b/addons/l10n_br/data/account_tax_template_data.xml
diff --git a/addons/l10n_br/data/account_chart_template.xml b/addons/l10n_br/data/l10n_br_chart_data.xml
index a828a551001..a828a551001 100644
--- a/addons/l10n_br/data/account_chart_template.xml
+++ b/addons/l10n_br/data/l10n_br_chart_data.xml
diff --git a/addons/l10n_br/models/__init__.py b/addons/l10n_br/models/__init__.py
new file mode 100644
index 00000000000..6cfaaa7a3ae
--- /dev/null
+++ b/addons/l10n_br/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- encoding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+# Copyright (C) 2009  Renato Lima - Akretion
+
+import account
diff --git a/addons/l10n_br/account.py b/addons/l10n_br/models/account.py
index e9f3111f742..e9f3111f742 100644
--- a/addons/l10n_br/account.py
+++ b/addons/l10n_br/models/account.py
diff --git a/addons/l10n_br/account_view.xml b/addons/l10n_br/views/account_view.xml
index de7dad9d5cb..de7dad9d5cb 100644
--- a/addons/l10n_br/account_view.xml
+++ b/addons/l10n_br/views/account_view.xml
diff --git a/addons/l10n_ca/__openerp__.py b/addons/l10n_ca/__openerp__.py
index d5233f51b25..041b4719842 100644
--- a/addons/l10n_ca/__openerp__.py
+++ b/addons/l10n_ca/__openerp__.py
@@ -42,13 +42,13 @@ position.
         'report',
     ],
     'data': [
-        'account_chart_template.xml',
-        'account_chart.xml',
-        'account_chart_template_after.xml',
-        'account_tax.xml',
-        'fiscal_templates.xml',
-        'account_chart_template.yml',
-        'data/res_company.xml',
+        'data/account_chart_template_data.xml',
+        'data/l10n_ca_chart_data.xml',
+        'data/account_chart_template_after_data.xml',
+        'data/account_tax_data.xml',
+        'data/fiscal_templates_data.xml',
+        'data/account_chart_template_data.yml',
+        'data/res_company_data.xml',
     ],
     'installable': True,
     'post_init_hook': 'load_translations',
diff --git a/addons/l10n_ca/account_chart_template_after.xml b/addons/l10n_ca/data/account_chart_template_after_data.xml
index ccf130b9f0e..ccf130b9f0e 100644
--- a/addons/l10n_ca/account_chart_template_after.xml
+++ b/addons/l10n_ca/data/account_chart_template_after_data.xml
diff --git a/addons/l10n_ca/account_chart_template.xml b/addons/l10n_ca/data/account_chart_template_data.xml
index 2e3198f562d..2e3198f562d 100644
--- a/addons/l10n_ca/account_chart_template.xml
+++ b/addons/l10n_ca/data/account_chart_template_data.xml
diff --git a/addons/l10n_ca/account_chart_template.yml b/addons/l10n_ca/data/account_chart_template_data.yml
index 783649c73ee..783649c73ee 100644
--- a/addons/l10n_ca/account_chart_template.yml
+++ b/addons/l10n_ca/data/account_chart_template_data.yml
diff --git a/addons/l10n_ca/account_tax.xml b/addons/l10n_ca/data/account_tax_data.xml
index 864f8402fb1..864f8402fb1 100644
--- a/addons/l10n_ca/account_tax.xml
+++ b/addons/l10n_ca/data/account_tax_data.xml
diff --git a/addons/l10n_ca/fiscal_templates.xml b/addons/l10n_ca/data/fiscal_templates_data.xml
index f09c1a94ed3..f09c1a94ed3 100644
--- a/addons/l10n_ca/fiscal_templates.xml
+++ b/addons/l10n_ca/data/fiscal_templates_data.xml
diff --git a/addons/l10n_ca/account_chart.xml b/addons/l10n_ca/data/l10n_ca_chart_data.xml
index 0a463374290..0a463374290 100644
--- a/addons/l10n_ca/account_chart.xml
+++ b/addons/l10n_ca/data/l10n_ca_chart_data.xml
diff --git a/addons/l10n_ca/data/res_company.xml b/addons/l10n_ca/data/res_company_data.xml
index 094a527132b..094a527132b 100644
--- a/addons/l10n_ca/data/res_company.xml
+++ b/addons/l10n_ca/data/res_company_data.xml
diff --git a/addons/l10n_ch/__openerp__.py b/addons/l10n_ch/__openerp__.py
index 10a9ab65d47..c9e4ed207fd 100644
--- a/addons/l10n_ch/__openerp__.py
+++ b/addons/l10n_ch/__openerp__.py
@@ -43,10 +43,10 @@ https://github.com/OCA/l10n-switzerland
  'category': 'Localization',
  'website': 'http://www.camptocamp.com',
  'depends': ['account', 'l10n_multilang'],
- 'data': ['chart/account.xml',
-          'chart/vat2011.xml',
-          'chart/fiscal_position.xml',
-          'account_chart_template.yml',
+ 'data': ['data/l10n_ch_chart_data.xml',
+          'data/account_vat2011_data.xml',
+          'data/account_fiscal_position_data.xml',
+          'data/account_chart_template_data.yml',
 
           ],
  'demo': [],
diff --git a/addons/l10n_ch/account_chart_template.yml b/addons/l10n_ch/data/account_chart_template_data.yml
index 80b148c7e70..80b148c7e70 100644
--- a/addons/l10n_ch/account_chart_template.yml
+++ b/addons/l10n_ch/data/account_chart_template_data.yml
diff --git a/addons/l10n_ch/chart/fiscal_position.xml b/addons/l10n_ch/data/account_fiscal_position_data.xml
index 70c402d6cf2..70c402d6cf2 100644
--- a/addons/l10n_ch/chart/fiscal_position.xml
+++ b/addons/l10n_ch/data/account_fiscal_position_data.xml
diff --git a/addons/l10n_ch/chart/vat2011.xml b/addons/l10n_ch/data/account_vat2011_data.xml
index a9dacd98253..a9dacd98253 100644
--- a/addons/l10n_ch/chart/vat2011.xml
+++ b/addons/l10n_ch/data/account_vat2011_data.xml
diff --git a/addons/l10n_ch/chart/account.xml b/addons/l10n_ch/data/l10n_ch_chart_data.xml
index adc5b08a620..adc5b08a620 100644
--- a/addons/l10n_ch/chart/account.xml
+++ b/addons/l10n_ch/data/l10n_ch_chart_data.xml
diff --git a/addons/l10n_cl/__openerp__.py b/addons/l10n_cl/__openerp__.py
index cb311aaac7f..55d4cc0c5cc 100644
--- a/addons/l10n_cl/__openerp__.py
+++ b/addons/l10n_cl/__openerp__.py
@@ -17,9 +17,9 @@ Plan contable chileno e impuestos de acuerdo a disposiciones vigentes
     'category': 'Localization',
     'depends': ['account'],
     'data': [
-        'l10n_cl_chart.xml',
-        'account_tax.xml',
-        'account_chart_template.yml',
+        'data/l10n_cl_chart_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'active': False,
diff --git a/addons/l10n_cl/account_chart_template.yml b/addons/l10n_cl/data/account_chart_template_data.yml
index 9002aaa4a76..9002aaa4a76 100644
--- a/addons/l10n_cl/account_chart_template.yml
+++ b/addons/l10n_cl/data/account_chart_template_data.yml
diff --git a/addons/l10n_cl/account_tax.xml b/addons/l10n_cl/data/account_tax_data.xml
index e3a8dac0a34..e3a8dac0a34 100644
--- a/addons/l10n_cl/account_tax.xml
+++ b/addons/l10n_cl/data/account_tax_data.xml
diff --git a/addons/l10n_cl/l10n_cl_chart.xml b/addons/l10n_cl/data/l10n_cl_chart_data.xml
index 04f6ba6aa0e..04f6ba6aa0e 100644
--- a/addons/l10n_cl/l10n_cl_chart.xml
+++ b/addons/l10n_cl/data/l10n_cl_chart_data.xml
diff --git a/addons/l10n_cn/__openerp__.py b/addons/l10n_cn/__openerp__.py
index 6530560f13f..12431cceab1 100644
--- a/addons/l10n_cn/__openerp__.py
+++ b/addons/l10n_cn/__openerp__.py
@@ -24,8 +24,8 @@
     """,
     'depends': ['base', 'account'],
     'data': [
-        'base_data.xml',
-        'account_chart_type.xml',
+        'data/res_country_state_data.xml',
+        'data/account_account_type_data.xml',
     ],
     'license': 'GPL-3',
     'installable': True,
diff --git a/addons/l10n_cn/account_chart_type.xml b/addons/l10n_cn/data/account_account_type_data.xml
index bd20e802cc5..bd20e802cc5 100644
--- a/addons/l10n_cn/account_chart_type.xml
+++ b/addons/l10n_cn/data/account_account_type_data.xml
diff --git a/addons/l10n_cn/base_data.xml b/addons/l10n_cn/data/res_country_state_data.xml
index e34ed0f0e43..e34ed0f0e43 100644
--- a/addons/l10n_cn/base_data.xml
+++ b/addons/l10n_cn/data/res_country_state_data.xml
diff --git a/addons/l10n_cn_small_business/__openerp__.py b/addons/l10n_cn_small_business/__openerp__.py
index 43e9ab5fb0c..c06f08242e2 100644
--- a/addons/l10n_cn_small_business/__openerp__.py
+++ b/addons/l10n_cn_small_business/__openerp__.py
@@ -24,8 +24,8 @@
     """,
     'depends': ['l10n_cn'],
     'data': [
-        'account_chart_template.xml',
-        'account_chart_template.yml',
+        'data/l10n_cn_small_business_chart_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'license': 'GPL-3',
     'installable': True,
diff --git a/addons/l10n_cn_small_business/account_chart_template.yml b/addons/l10n_cn_small_business/data/account_chart_template_data.yml
index f1d6e114f9d..f1d6e114f9d 100644
--- a/addons/l10n_cn_small_business/account_chart_template.yml
+++ b/addons/l10n_cn_small_business/data/account_chart_template_data.yml
diff --git a/addons/l10n_cn_small_business/account_chart_template.xml b/addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_data.xml
index 206fa50399a..206fa50399a 100644
--- a/addons/l10n_cn_small_business/account_chart_template.xml
+++ b/addons/l10n_cn_small_business/data/l10n_cn_small_business_chart_data.xml
diff --git a/addons/l10n_cn_standard/__openerp__.py b/addons/l10n_cn_standard/__openerp__.py
index beb68e335dd..1b12c0702c4 100644
--- a/addons/l10n_cn_standard/__openerp__.py
+++ b/addons/l10n_cn_standard/__openerp__.py
@@ -24,8 +24,8 @@
     """,
     'depends': ['l10n_cn'],
     'data': [
-        'account_chart_template.xml',
-        'account_chart_template.yml',
+        'data/l10n_cn_standard_chart_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'license': 'GPL-3',
     'installable': True,
diff --git a/addons/l10n_cn_standard/account_chart_template.yml b/addons/l10n_cn_standard/data/account_chart_template_data.yml
index 9b8d7af60aa..9b8d7af60aa 100644
--- a/addons/l10n_cn_standard/account_chart_template.yml
+++ b/addons/l10n_cn_standard/data/account_chart_template_data.yml
diff --git a/addons/l10n_cn_standard/account_chart_template.xml b/addons/l10n_cn_standard/data/l10n_cn_standard_chart_data.xml
index 5f38ab4c751..5f38ab4c751 100644
--- a/addons/l10n_cn_standard/account_chart_template.xml
+++ b/addons/l10n_cn_standard/data/l10n_cn_standard_chart_data.xml
diff --git a/addons/l10n_co/__openerp__.py b/addons/l10n_co/__openerp__.py
index 10189f02805..6bf84bc8eee 100644
--- a/addons/l10n_co/__openerp__.py
+++ b/addons/l10n_co/__openerp__.py
@@ -20,12 +20,12 @@
     ],
     'data': [
         'data/account.account.tag.csv',
-        'data/account_chart_template_before.xml',
+        'data/l10n_co_chart_data.xml',
         'data/account.account.template.csv',
-        'data/account_chart_template.xml',
+        'data/account_chart_template_data.xml',
         'data/account.tax.template.csv',
-        'data/account_tax_group.xml',
-        'data/account_chart_template.yml',
+        'data/account_tax_group_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_co/data/account_chart_template.xml b/addons/l10n_co/data/account_chart_template_data.xml
index b4c95b640b6..b4c95b640b6 100644
--- a/addons/l10n_co/data/account_chart_template.xml
+++ b/addons/l10n_co/data/account_chart_template_data.xml
diff --git a/addons/l10n_co/data/account_chart_template.yml b/addons/l10n_co/data/account_chart_template_data.yml
index 13972d8a902..13972d8a902 100644
--- a/addons/l10n_co/data/account_chart_template.yml
+++ b/addons/l10n_co/data/account_chart_template_data.yml
diff --git a/addons/l10n_co/data/account_tax_group.xml b/addons/l10n_co/data/account_tax_group_data.xml
index 1de81299ab9..1de81299ab9 100644
--- a/addons/l10n_co/data/account_tax_group.xml
+++ b/addons/l10n_co/data/account_tax_group_data.xml
diff --git a/addons/l10n_co/data/account_chart_template_before.xml b/addons/l10n_co/data/l10n_co_chart_data.xml
index 200e89d70ea..200e89d70ea 100644
--- a/addons/l10n_co/data/account_chart_template_before.xml
+++ b/addons/l10n_co/data/l10n_co_chart_data.xml
diff --git a/addons/l10n_cr/__openerp__.py b/addons/l10n_cr/__openerp__.py
index 91a2f528689..691e3ccb288 100644
--- a/addons/l10n_cr/__openerp__.py
+++ b/addons/l10n_cr/__openerp__.py
@@ -54,12 +54,12 @@ please go to http://translations.launchpad.net/openerp-costa-rica.
     """,
     'depends': ['account'],
     'data': [
-        'data/l10n_cr_base_data.xml',
-        'data/account_chart_template.xml',
-        'data/account_account_template.xml',
-        'data/account_chart_template_after.xml',
-        'data/account_tax_template.xml',
-        'data/account.chart.template.yml',
+        'data/l10n_cr_state_data.xml',
+        'data/l10n_cr_chart_data.xml',
+        'data/account_template_data.xml',
+        'data/account_chart_template_data.xml',
+        'data/account_tax_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_cr/data/account_chart_template_after.xml b/addons/l10n_cr/data/account_chart_template_data.xml
index 1dc47df4848..1dc47df4848 100644
--- a/addons/l10n_cr/data/account_chart_template_after.xml
+++ b/addons/l10n_cr/data/account_chart_template_data.xml
diff --git a/addons/l10n_cr/data/account.chart.template.yml b/addons/l10n_cr/data/account_chart_template_data.yml
index 6c2eb3eaa7a..6c2eb3eaa7a 100644
--- a/addons/l10n_cr/data/account.chart.template.yml
+++ b/addons/l10n_cr/data/account_chart_template_data.yml
diff --git a/addons/l10n_cr/data/account_tax_template.xml b/addons/l10n_cr/data/account_tax_template_data.xml
index b24913f9b3c..b24913f9b3c 100644
--- a/addons/l10n_cr/data/account_tax_template.xml
+++ b/addons/l10n_cr/data/account_tax_template_data.xml
diff --git a/addons/l10n_cr/data/account_account_template.xml b/addons/l10n_cr/data/account_template_data.xml
index 16cc800757c..16cc800757c 100644
--- a/addons/l10n_cr/data/account_account_template.xml
+++ b/addons/l10n_cr/data/account_template_data.xml
diff --git a/addons/l10n_cr/data/account_chart_template.xml b/addons/l10n_cr/data/l10n_cr_chart_data.xml
index 41b97f998b7..41b97f998b7 100644
--- a/addons/l10n_cr/data/account_chart_template.xml
+++ b/addons/l10n_cr/data/l10n_cr_chart_data.xml
diff --git a/addons/l10n_cr/data/l10n_cr_base_data.xml b/addons/l10n_cr/data/l10n_cr_state_data.xml
index 136c10508ee..136c10508ee 100644
--- a/addons/l10n_cr/data/l10n_cr_base_data.xml
+++ b/addons/l10n_cr/data/l10n_cr_state_data.xml
diff --git a/addons/l10n_de/__openerp__.py b/addons/l10n_de/__openerp__.py
index 99cc2f770b6..880fc407e9c 100644
--- a/addons/l10n_de/__openerp__.py
+++ b/addons/l10n_de/__openerp__.py
@@ -17,9 +17,9 @@ German accounting chart and localization.
     'depends': ['account', 'base_iban', 'base_vat'],
     'demo': [],
     'data': [
-        'account_account_types.xml',
-        'account_account_tags.xml',
-        'menuitem.xml',
+        'data/account_account_types_data.xml',
+        'data/account_account_tags_data.xml',
+        'data/menuitem_data.xml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_de/account_account_tags.xml b/addons/l10n_de/data/account_account_tags_data.xml
index a104169e087..a104169e087 100644
--- a/addons/l10n_de/account_account_tags.xml
+++ b/addons/l10n_de/data/account_account_tags_data.xml
diff --git a/addons/l10n_de/account_account_types.xml b/addons/l10n_de/data/account_account_types_data.xml
index f069585219f..f069585219f 100644
--- a/addons/l10n_de/account_account_types.xml
+++ b/addons/l10n_de/data/account_account_types_data.xml
diff --git a/addons/l10n_de/menuitem.xml b/addons/l10n_de/data/menuitem_data.xml
index 084fbe6b24a..084fbe6b24a 100644
--- a/addons/l10n_de/menuitem.xml
+++ b/addons/l10n_de/data/menuitem_data.xml
diff --git a/addons/l10n_de_skr03/__openerp__.py b/addons/l10n_de_skr03/__openerp__.py
index 7a4943714db..e4eef63530e 100644
--- a/addons/l10n_de_skr03/__openerp__.py
+++ b/addons/l10n_de_skr03/__openerp__.py
@@ -66,9 +66,9 @@ German accounting chart and localization.
     'depends': ['l10n_de'],
     'demo': [],
     'data': [
-        'account_chart.xml',
-        'account_tax_fiscal_position.xml',
-        'account.chart.template.yml',
+        'data/l10n_de_skr03_chart_data.xml',
+        'data/account_tax_fiscal_position_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_de_skr03/account.chart.template.yml b/addons/l10n_de_skr03/data/account_chart_template_data.yml
index 9fbf6034a6c..9fbf6034a6c 100644
--- a/addons/l10n_de_skr03/account.chart.template.yml
+++ b/addons/l10n_de_skr03/data/account_chart_template_data.yml
diff --git a/addons/l10n_de_skr03/account_tax_fiscal_position.xml b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
index e8122211c65..e8122211c65 100644
--- a/addons/l10n_de_skr03/account_tax_fiscal_position.xml
+++ b/addons/l10n_de_skr03/data/account_tax_fiscal_position_data.xml
diff --git a/addons/l10n_de_skr03/account_chart.xml b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
index 368cd9a5937..368cd9a5937 100644
--- a/addons/l10n_de_skr03/account_chart.xml
+++ b/addons/l10n_de_skr03/data/l10n_de_skr03_chart_data.xml
diff --git a/addons/l10n_de_skr04/__openerp__.py b/addons/l10n_de_skr04/__openerp__.py
index 9c5c21cc85e..8141baf196d 100644
--- a/addons/l10n_de_skr04/__openerp__.py
+++ b/addons/l10n_de_skr04/__openerp__.py
@@ -68,9 +68,9 @@ German accounting chart and localization.
     'depends': ['l10n_de'],
     'demo': [],
     'data': [
-        'account_chart.xml',
-        'account_tax_fiscal_position.xml',
-        'account.chart.template.yml',
+        'data/l10n_de_skr04_chart_data.xml',
+        'data/account_tax_fiscal_position_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_de_skr04/account.chart.template.yml b/addons/l10n_de_skr04/data/account_chart_template_data.yml
index aee96ad34d7..aee96ad34d7 100644
--- a/addons/l10n_de_skr04/account.chart.template.yml
+++ b/addons/l10n_de_skr04/data/account_chart_template_data.yml
diff --git a/addons/l10n_de_skr04/account_tax_fiscal_position.xml b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
index 28ab2aba156..28ab2aba156 100644
--- a/addons/l10n_de_skr04/account_tax_fiscal_position.xml
+++ b/addons/l10n_de_skr04/data/account_tax_fiscal_position_data.xml
diff --git a/addons/l10n_de_skr04/account_chart.xml b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
index 81b0d42574f..81b0d42574f 100644
--- a/addons/l10n_de_skr04/account_chart.xml
+++ b/addons/l10n_de_skr04/data/l10n_de_skr04_chart_data.xml
diff --git a/addons/l10n_do/__openerp__.py b/addons/l10n_do/__openerp__.py
index a3f9fc3cada..3dc2004f8ab 100644
--- a/addons/l10n_do/__openerp__.py
+++ b/addons/l10n_do/__openerp__.py
@@ -23,17 +23,17 @@ This is the base module to manage the accounting chart for Dominican Republic.
     'depends': ['account', 'base_iban'],
     'data': [
         # basic accounting data
-        'data/account_chart_template.xml',
+        'data/l10n_do_chart_data.xml',
         'data/account.account.template.csv',
-        'data/set_account_on_chart_template.xml',
-        'data/account_account_tag.xml',
+        'data/account_chart_template_data.xml',
+        'data/account_account_tag_data.xml',
         'data/account.tax.template.csv',
-        'data/l10n_do_base_data.xml',
+        'data/l10n_do_state_data.xml',
         # Adds fiscal position
         'data/account.fiscal.position.template.csv',
         'data/account.fiscal.position.tax.template.csv',
         # configuration wizard, views, reports...
-        'data/account_chart_template.yml',
+        'data/account_chart_template_data.yml',
     ],
     'test': [],
     'demo': [],
diff --git a/addons/l10n_do/data/account_account_tag.xml b/addons/l10n_do/data/account_account_tag_data.xml
index 68d922c8f63..68d922c8f63 100644
--- a/addons/l10n_do/data/account_account_tag.xml
+++ b/addons/l10n_do/data/account_account_tag_data.xml
diff --git a/addons/l10n_do/data/set_account_on_chart_template.xml b/addons/l10n_do/data/account_chart_template_data.xml
index 3cfff934abb..3cfff934abb 100644
--- a/addons/l10n_do/data/set_account_on_chart_template.xml
+++ b/addons/l10n_do/data/account_chart_template_data.xml
diff --git a/addons/l10n_do/data/account_chart_template.yml b/addons/l10n_do/data/account_chart_template_data.yml
index bbae47a8ee6..bbae47a8ee6 100644
--- a/addons/l10n_do/data/account_chart_template.yml
+++ b/addons/l10n_do/data/account_chart_template_data.yml
diff --git a/addons/l10n_do/data/account_chart_template.xml b/addons/l10n_do/data/l10n_do_chart_data.xml
index d5a8fcc8c0c..d5a8fcc8c0c 100644
--- a/addons/l10n_do/data/account_chart_template.xml
+++ b/addons/l10n_do/data/l10n_do_chart_data.xml
diff --git a/addons/l10n_do/data/l10n_do_base_data.xml b/addons/l10n_do/data/l10n_do_state_data.xml
index 80364b1a209..80364b1a209 100644
--- a/addons/l10n_do/data/l10n_do_base_data.xml
+++ b/addons/l10n_do/data/l10n_do_state_data.xml
diff --git a/addons/l10n_ec/__openerp__.py b/addons/l10n_ec/__openerp__.py
index ca3e2715281..8d7a8fa2cf6 100644
--- a/addons/l10n_ec/__openerp__.py
+++ b/addons/l10n_ec/__openerp__.py
@@ -20,9 +20,9 @@ Accounting chart and localization for Ecuador.
         'base_iban',
     ],
     'data': [
-        'account_chart.xml',
-        'account_tax.xml',
-        'account_chart_template.yml',
+        'data/l10n_ec_chart_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_ec/account_chart_template.yml b/addons/l10n_ec/data/account_chart_template_data.yml
index c35e8765fe4..c35e8765fe4 100644
--- a/addons/l10n_ec/account_chart_template.yml
+++ b/addons/l10n_ec/data/account_chart_template_data.yml
diff --git a/addons/l10n_ec/account_tax.xml b/addons/l10n_ec/data/account_tax_data.xml
index c1a5cdd17cf..c1a5cdd17cf 100644
--- a/addons/l10n_ec/account_tax.xml
+++ b/addons/l10n_ec/data/account_tax_data.xml
diff --git a/addons/l10n_ec/account_chart.xml b/addons/l10n_ec/data/l10n_ec_chart_data.xml
index f8e160b38aa..f8e160b38aa 100644
--- a/addons/l10n_ec/account_chart.xml
+++ b/addons/l10n_ec/data/l10n_ec_chart_data.xml
diff --git a/addons/l10n_es/__openerp__.py b/addons/l10n_es/__openerp__.py
index 9655ec66f20..84a3e4c507b 100644
--- a/addons/l10n_es/__openerp__.py
+++ b/addons/l10n_es/__openerp__.py
@@ -28,13 +28,13 @@ Spanish charts of accounts (PGCE 2008).
 """,
     "depends" : ["account", "base_vat", "base_iban"],
     "data" : [
-        "account_type.xml",
-        "account_chart_template.xml",
-        "account_account_common.xml",
-        "taxes_common.xml",
-        "fiscal_templates_common.xml",
-        "account_chart_template_post.xml",
-        "account_chart_template.yml",
+        'data/account_account_type_data.xml',
+        'data/l10n_es_chart_data.xml',
+        'data/account_account_template_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_fiscal_position_template_data.xml',
+        'data/account_chart_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     "demo" : [],
     'auto_install': False,
diff --git a/addons/l10n_es/account_account_common.xml b/addons/l10n_es/data/account_account_template_data.xml
index 0d0621c8d01..0d0621c8d01 100644
--- a/addons/l10n_es/account_account_common.xml
+++ b/addons/l10n_es/data/account_account_template_data.xml
diff --git a/addons/l10n_es/account_type.xml b/addons/l10n_es/data/account_account_type_data.xml
index 732de342206..732de342206 100644
--- a/addons/l10n_es/account_type.xml
+++ b/addons/l10n_es/data/account_account_type_data.xml
diff --git a/addons/l10n_es/account_chart_template_post.xml b/addons/l10n_es/data/account_chart_template_data.xml
index 091250514d3..091250514d3 100644
--- a/addons/l10n_es/account_chart_template_post.xml
+++ b/addons/l10n_es/data/account_chart_template_data.xml
diff --git a/addons/l10n_es/account_chart_template.yml b/addons/l10n_es/data/account_chart_template_data.yml
index 61d26360d4d..61d26360d4d 100644
--- a/addons/l10n_es/account_chart_template.yml
+++ b/addons/l10n_es/data/account_chart_template_data.yml
diff --git a/addons/l10n_es/fiscal_templates_common.xml b/addons/l10n_es/data/account_fiscal_position_template_data.xml
index 9c76696255b..9c76696255b 100644
--- a/addons/l10n_es/fiscal_templates_common.xml
+++ b/addons/l10n_es/data/account_fiscal_position_template_data.xml
diff --git a/addons/l10n_es/taxes_common.xml b/addons/l10n_es/data/account_tax_data.xml
index 30321a25de7..30321a25de7 100644
--- a/addons/l10n_es/taxes_common.xml
+++ b/addons/l10n_es/data/account_tax_data.xml
diff --git a/addons/l10n_es/account_chart_template.xml b/addons/l10n_es/data/l10n_es_chart_data.xml
index ab0f70eaa08..ab0f70eaa08 100644
--- a/addons/l10n_es/account_chart_template.xml
+++ b/addons/l10n_es/data/l10n_es_chart_data.xml
diff --git a/addons/l10n_et/__openerp__.py b/addons/l10n_et/__openerp__.py
index aa70ca13091..b8b981345e7 100644
--- a/addons/l10n_et/__openerp__.py
+++ b/addons/l10n_et/__openerp__.py
@@ -23,12 +23,12 @@ This is the latest Ethiopian Odoo localization and consists of:
         'base_vat',
     ],
     'data': [
-        'data/account_chart_template.xml',
+        'data/l10n_et_chart_data.xml',
         'data/account.account.template.csv',
-        'data/set_account_on_chart_template.xml',
-        'data/account_account_tag.xml',
+        'data/account_chart_template_data.xml',
+        'data/account_account_tag_data.xml',
         'data/account.tax.template.csv',
-        'data/account_chart_template.yml',
+        'data/account_chart_template_data.yml',
         'data/res.country.state.csv',
     ],
     'installable': True,
diff --git a/addons/l10n_et/data/account_account_tag.xml b/addons/l10n_et/data/account_account_tag_data.xml
index 8d22ca80fb9..8d22ca80fb9 100644
--- a/addons/l10n_et/data/account_account_tag.xml
+++ b/addons/l10n_et/data/account_account_tag_data.xml
diff --git a/addons/l10n_et/data/set_account_on_chart_template.xml b/addons/l10n_et/data/account_chart_template_data.xml
index de564c6bfe1..de564c6bfe1 100644
--- a/addons/l10n_et/data/set_account_on_chart_template.xml
+++ b/addons/l10n_et/data/account_chart_template_data.xml
diff --git a/addons/l10n_et/data/account_chart_template.yml b/addons/l10n_et/data/account_chart_template_data.yml
index 6c49d6e9165..6c49d6e9165 100644
--- a/addons/l10n_et/data/account_chart_template.yml
+++ b/addons/l10n_et/data/account_chart_template_data.yml
diff --git a/addons/l10n_et/data/account_chart_template.xml b/addons/l10n_et/data/l10n_et_chart_data.xml
index d3d560834ac..d3d560834ac 100644
--- a/addons/l10n_et/data/account_chart_template.xml
+++ b/addons/l10n_et/data/l10n_et_chart_data.xml
diff --git a/addons/l10n_fr/__init__.py b/addons/l10n_fr/__init__.py
index daea072a981..4b6eae9a9e4 100644
--- a/addons/l10n_fr/__init__.py
+++ b/addons/l10n_fr/__init__.py
@@ -3,4 +3,4 @@
 
 # Copyright (c) 2008 JAILLET Simon - CrysaLEAD - www.crysalead.fr
 
-import l10n_fr
+import models
diff --git a/addons/l10n_fr/__openerp__.py b/addons/l10n_fr/__openerp__.py
index d31019f310e..a0ef08fd7c2 100644
--- a/addons/l10n_fr/__openerp__.py
+++ b/addons/l10n_fr/__openerp__.py
@@ -31,12 +31,12 @@ configuration of their taxes and fiscal positions manually.
 """,
     'depends': ['base_iban', 'account', 'base_vat'],
     'data': [
-        'fr_pcg_taxes.xml',
-        'plan_comptable_general.xml',
-        'l10n_fr_view.xml',
-        'fr_tax.xml',
-        'fr_fiscal_templates.xml',
-        'account_chart_template.yml',
+        'data/l10n_fr_chart_data.xml',
+        'data/account_chart_template_data.xml',
+        'views/l10n_fr_view.xml',
+        'data/account_tax_data.xml',
+        'data/account_fiscal_position_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'auto_install': False,
diff --git a/addons/l10n_fr/plan_comptable_general.xml b/addons/l10n_fr/data/account_chart_template_data.xml
index f846e6178a3..f846e6178a3 100644
--- a/addons/l10n_fr/plan_comptable_general.xml
+++ b/addons/l10n_fr/data/account_chart_template_data.xml
diff --git a/addons/l10n_fr/account_chart_template.yml b/addons/l10n_fr/data/account_chart_template_data.yml
index 1a13c0f3b3f..1a13c0f3b3f 100644
--- a/addons/l10n_fr/account_chart_template.yml
+++ b/addons/l10n_fr/data/account_chart_template_data.yml
diff --git a/addons/l10n_fr/fr_fiscal_templates.xml b/addons/l10n_fr/data/account_fiscal_position_template_data.xml
index d9f9975abe2..d9f9975abe2 100644
--- a/addons/l10n_fr/fr_fiscal_templates.xml
+++ b/addons/l10n_fr/data/account_fiscal_position_template_data.xml
diff --git a/addons/l10n_fr/fr_tax.xml b/addons/l10n_fr/data/account_tax_data.xml
index 4b88624de95..4b88624de95 100644
--- a/addons/l10n_fr/fr_tax.xml
+++ b/addons/l10n_fr/data/account_tax_data.xml
diff --git a/addons/l10n_fr/fr_pcg_taxes.xml b/addons/l10n_fr/data/l10n_fr_chart_data.xml
index 8b574200000..8b574200000 100644
--- a/addons/l10n_fr/fr_pcg_taxes.xml
+++ b/addons/l10n_fr/data/l10n_fr_chart_data.xml
diff --git a/addons/l10n_fr/models/__init__.py b/addons/l10n_fr/models/__init__.py
new file mode 100644
index 00000000000..564ac1728cb
--- /dev/null
+++ b/addons/l10n_fr/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import l10n_fr
diff --git a/addons/l10n_fr/l10n_fr.py b/addons/l10n_fr/models/l10n_fr.py
index dd367eb0549..dd367eb0549 100644
--- a/addons/l10n_fr/l10n_fr.py
+++ b/addons/l10n_fr/models/l10n_fr.py
diff --git a/addons/l10n_fr/l10n_fr_view.xml b/addons/l10n_fr/views/l10n_fr_view.xml
index 5d71c27413f..5d71c27413f 100644
--- a/addons/l10n_fr/l10n_fr_view.xml
+++ b/addons/l10n_fr/views/l10n_fr_view.xml
diff --git a/addons/l10n_generic_coa/__openerp__.py b/addons/l10n_generic_coa/__openerp__.py
index e0b9222009a..17a53ecb868 100644
--- a/addons/l10n_generic_coa/__openerp__.py
+++ b/addons/l10n_generic_coa/__openerp__.py
@@ -15,8 +15,8 @@ Install some generic chart of accounts.
         'account',
     ],
     'data': [
-        'data/configurable_account_chart.xml',
-        'account_chart_template.yml',
+        'data/l10n_generic_coa_chart_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'test': [
         '../account/test/account_bank_statement.yml',
diff --git a/addons/l10n_generic_coa/account_chart_template.yml b/addons/l10n_generic_coa/data/account_chart_template_data.yml
index d00cb6ee528..d00cb6ee528 100644
--- a/addons/l10n_generic_coa/account_chart_template.yml
+++ b/addons/l10n_generic_coa/data/account_chart_template_data.yml
diff --git a/addons/l10n_generic_coa/data/configurable_account_chart.xml b/addons/l10n_generic_coa/data/l10n_generic_coa_chart_data.xml
index 602e9fd90be..602e9fd90be 100644
--- a/addons/l10n_generic_coa/data/configurable_account_chart.xml
+++ b/addons/l10n_generic_coa/data/l10n_generic_coa_chart_data.xml
diff --git a/addons/l10n_gr/__openerp__.py b/addons/l10n_gr/__openerp__.py
index cdc4b9ef259..03e33c5ba60 100644
--- a/addons/l10n_gr/__openerp__.py
+++ b/addons/l10n_gr/__openerp__.py
@@ -17,11 +17,11 @@ Greek accounting chart and localization.
     """,
     'depends': ['base', 'account', 'base_iban', 'base_vat'],
     'demo': [],
-    'data': [ 'account_types.xml',
-               'account_full_chart.xml',
-               'account_tax.xml',
-               'account_tax_vat.xml',
-               'account_chart_template.yml'
+    'data': [ 'data/account_type_data.xml',
+              'data/l10n_gr_chart_data.xml',
+              'data/account_chart_template_data.xml',
+              'data/account_tax_data.xml',
+              'data/account_chart_template_data.yml'
     ],
     'installable': True,
 }
diff --git a/addons/l10n_gr/account_tax.xml b/addons/l10n_gr/data/account_chart_template_data.xml
index 2ad504e8879..2ad504e8879 100644
--- a/addons/l10n_gr/account_tax.xml
+++ b/addons/l10n_gr/data/account_chart_template_data.xml
diff --git a/addons/l10n_gr/account_chart_template.yml b/addons/l10n_gr/data/account_chart_template_data.yml
index f00dca050f5..f00dca050f5 100644
--- a/addons/l10n_gr/account_chart_template.yml
+++ b/addons/l10n_gr/data/account_chart_template_data.yml
diff --git a/addons/l10n_gr/account_tax_vat.xml b/addons/l10n_gr/data/account_tax_data.xml
index e4156341ae4..e4156341ae4 100644
--- a/addons/l10n_gr/account_tax_vat.xml
+++ b/addons/l10n_gr/data/account_tax_data.xml
diff --git a/addons/l10n_gr/account_types.xml b/addons/l10n_gr/data/account_type_data.xml
index 46471e23a41..46471e23a41 100644
--- a/addons/l10n_gr/account_types.xml
+++ b/addons/l10n_gr/data/account_type_data.xml
diff --git a/addons/l10n_gr/account_full_chart.xml b/addons/l10n_gr/data/l10n_gr_chart_data.xml
index 875adfbd244..875adfbd244 100644
--- a/addons/l10n_gr/account_full_chart.xml
+++ b/addons/l10n_gr/data/l10n_gr_chart_data.xml
diff --git a/addons/l10n_gt/__openerp__.py b/addons/l10n_gt/__openerp__.py
index 4a3d73ef98a..5db342ccdb6 100644
--- a/addons/l10n_gt/__openerp__.py
+++ b/addons/l10n_gt/__openerp__.py
@@ -32,9 +32,9 @@ taxes and the Quetzal currency.""",
     'website': 'http://solucionesprisma.com/',
     'depends': ['base', 'account'],
     'data': [
-        'account_chart.xml',
-        'l10n_gt_base.xml',
-        'account_chart_template.yml',
+        'data/l10n_gt_chart_data.xml',
+        'data/account_chart_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_gt/l10n_gt_base.xml b/addons/l10n_gt/data/account_chart_template_data.xml
index 70a60fc9a02..70a60fc9a02 100644
--- a/addons/l10n_gt/l10n_gt_base.xml
+++ b/addons/l10n_gt/data/account_chart_template_data.xml
diff --git a/addons/l10n_gt/account_chart_template.yml b/addons/l10n_gt/data/account_chart_template_data.yml
index 339a318d28d..339a318d28d 100644
--- a/addons/l10n_gt/account_chart_template.yml
+++ b/addons/l10n_gt/data/account_chart_template_data.yml
diff --git a/addons/l10n_gt/account_chart.xml b/addons/l10n_gt/data/l10n_gt_chart_data.xml
index 8efcc1a12e6..8efcc1a12e6 100644
--- a/addons/l10n_gt/account_chart.xml
+++ b/addons/l10n_gt/data/l10n_gt_chart_data.xml
diff --git a/addons/l10n_hn/__openerp__.py b/addons/l10n_hn/__openerp__.py
index 5cefa1c4fc4..142df43f661 100644
--- a/addons/l10n_hn/__openerp__.py
+++ b/addons/l10n_hn/__openerp__.py
@@ -32,9 +32,9 @@ and the Lempira currency.""",
     'website': 'http://trigluu.com',
     'depends': ['base', 'account'],
     'data': [
-        'account_chart.xml',
-        'l10n_hn_base.xml',
-        'account_chart_template.yml',
+        'data/l10n_hn_chart_data.xml',
+        'data/account_chart_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_hn/l10n_hn_base.xml b/addons/l10n_hn/data/account_chart_template_data.xml
index 37d2ce41f4c..37d2ce41f4c 100644
--- a/addons/l10n_hn/l10n_hn_base.xml
+++ b/addons/l10n_hn/data/account_chart_template_data.xml
diff --git a/addons/l10n_hn/account_chart_template.yml b/addons/l10n_hn/data/account_chart_template_data.yml
index aa01abb2d4f..aa01abb2d4f 100644
--- a/addons/l10n_hn/account_chart_template.yml
+++ b/addons/l10n_hn/data/account_chart_template_data.yml
diff --git a/addons/l10n_hn/account_chart.xml b/addons/l10n_hn/data/l10n_hn_chart_data.xml
index a0251abd4a0..a0251abd4a0 100644
--- a/addons/l10n_hn/account_chart.xml
+++ b/addons/l10n_hn/data/l10n_hn_chart_data.xml
diff --git a/addons/l10n_hr/__openerp__.py b/addons/l10n_hr/__openerp__.py
index 61a95c67c41..99578b0da28 100644
--- a/addons/l10n_hr/__openerp__.py
+++ b/addons/l10n_hr/__openerp__.py
@@ -47,13 +47,13 @@ Izvori podataka:
         'account',
     ],
     'data': [
-        'data/account_chart_template.xml',
+        'data/l10n_hr_chart_data.xml',
         'data/account.account.type.csv',
         'data/account.account.template.csv',
-        'data/account_chart_tag.xml',
+        'data/account_chart_tag_data.xml',
         'data/account.tax.template.csv',
-        'data/fiscal_position_template.xml',
-        'data/account_chart_template.yml',
+        'data/account_tax_fiscal_position_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     "demo": [],
     'test': [],
diff --git a/addons/l10n_hr/data/account_chart_tag.xml b/addons/l10n_hr/data/account_chart_tag_data.xml
index 2bc48a95549..2bc48a95549 100644
--- a/addons/l10n_hr/data/account_chart_tag.xml
+++ b/addons/l10n_hr/data/account_chart_tag_data.xml
diff --git a/addons/l10n_hr/data/account_chart_template.yml b/addons/l10n_hr/data/account_chart_template_data.yml
index a2c5593dbd5..a2c5593dbd5 100644
--- a/addons/l10n_hr/data/account_chart_template.yml
+++ b/addons/l10n_hr/data/account_chart_template_data.yml
diff --git a/addons/l10n_hr/data/fiscal_position_template.xml b/addons/l10n_hr/data/account_tax_fiscal_position_data.xml
index 02c1f82b51a..02c1f82b51a 100644
--- a/addons/l10n_hr/data/fiscal_position_template.xml
+++ b/addons/l10n_hr/data/account_tax_fiscal_position_data.xml
diff --git a/addons/l10n_hr/data/account_chart_template.xml b/addons/l10n_hr/data/l10n_hr_chart_data.xml
index 39542801d5e..39542801d5e 100644
--- a/addons/l10n_hr/data/account_chart_template.xml
+++ b/addons/l10n_hr/data/l10n_hr_chart_data.xml
diff --git a/addons/l10n_hu/__openerp__.py b/addons/l10n_hu/__openerp__.py
index 412012f572f..df485c6cabf 100644
--- a/addons/l10n_hu/__openerp__.py
+++ b/addons/l10n_hu/__openerp__.py
@@ -22,15 +22,15 @@ This module consists :
     'website': 'http://www.innopen.eu',
     'depends': ['account'],
     'data': [
-        'data/account_chart_template.xml',
+        'data/l10n_hu_chart_data.xml',
         'data/account.account.template.csv',
         'data/account.account.tag.csv',
         'data/account.tax.template.csv',
         'data/account.fiscal.position.template.csv',
         'data/account.fiscal.position.tax.template.csv',
         'data/res.bank.csv',
-        'data/account_chart_template_after.xml',
-        'data/account_chart_template.yml',
+        'data/account_chart_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'installable': True,
     'auto_install': False,
diff --git a/addons/l10n_hu/data/account_chart_template_after.xml b/addons/l10n_hu/data/account_chart_template_data.xml
index 29ae5e32420..29ae5e32420 100644
--- a/addons/l10n_hu/data/account_chart_template_after.xml
+++ b/addons/l10n_hu/data/account_chart_template_data.xml
diff --git a/addons/l10n_hu/data/account_chart_template.yml b/addons/l10n_hu/data/account_chart_template_data.yml
index 81c996983b0..81c996983b0 100644
--- a/addons/l10n_hu/data/account_chart_template.yml
+++ b/addons/l10n_hu/data/account_chart_template_data.yml
diff --git a/addons/l10n_hu/data/account_chart_template.xml b/addons/l10n_hu/data/l10n_hu_chart_data.xml
index d5e589b46ab..d5e589b46ab 100644
--- a/addons/l10n_hu/data/account_chart_template.xml
+++ b/addons/l10n_hu/data/l10n_hu_chart_data.xml
diff --git a/addons/l10n_in/__openerp__.py b/addons/l10n_in/__openerp__.py
index 12091d356d7..2205f172b2f 100644
--- a/addons/l10n_in/__openerp__.py
+++ b/addons/l10n_in/__openerp__.py
@@ -22,9 +22,9 @@ Sheet, now only Vertical format has been permitted Which is Supported By Odoo.
     ],
     'demo': [],
     'data': [
-        'l10n_in_standard_chart.xml',
-        'l10n_in_standard_tax_template.xml',
-        'account_chart_template.yml',
+        'data/l10n_in_chart_data.xml',
+        'data/account_tax_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'auto_install': False,
     'installable': True,
diff --git a/addons/l10n_in/account_chart_template.yml b/addons/l10n_in/data/account_chart_template_data.yml
index ae14e1cfe23..ae14e1cfe23 100644
--- a/addons/l10n_in/account_chart_template.yml
+++ b/addons/l10n_in/data/account_chart_template_data.yml
diff --git a/addons/l10n_in/l10n_in_standard_tax_template.xml b/addons/l10n_in/data/account_tax_template_data.xml
index bf517691e55..bf517691e55 100644
--- a/addons/l10n_in/l10n_in_standard_tax_template.xml
+++ b/addons/l10n_in/data/account_tax_template_data.xml
diff --git a/addons/l10n_in/l10n_in_standard_chart.xml b/addons/l10n_in/data/l10n_in_chart_data.xml
index cccc4e32827..cccc4e32827 100644
--- a/addons/l10n_in/l10n_in_standard_chart.xml
+++ b/addons/l10n_in/data/l10n_in_chart_data.xml
diff --git a/addons/l10n_it/__openerp__.py b/addons/l10n_it/__openerp__.py
index ec848b41b1d..9afaea09c7e 100644
--- a/addons/l10n_it/__openerp__.py
+++ b/addons/l10n_it/__openerp__.py
@@ -15,12 +15,12 @@ Italian accounting chart and localization.
     'category': 'Localization',
     'website': 'http://www.openerp-italia.org/',
     'data': [
-        'data/account_chart.xml',
+        'data/l10n_it_chart_data.xml',
         'data/account.account.template.csv',
         'data/account.tax.template.csv',
         'data/account.fiscal.position.template.csv',
         'data/account.chart.template.csv',
-        'data/account_chart_template.yml',
+        'data/account_chart_template_data.yml',
         ],
     'demo': [],
     'auto_install': False,
diff --git a/addons/l10n_it/data/account_chart_template.yml b/addons/l10n_it/data/account_chart_template_data.yml
index 0fbbf562c4b..0fbbf562c4b 100644
--- a/addons/l10n_it/data/account_chart_template.yml
+++ b/addons/l10n_it/data/account_chart_template_data.yml
diff --git a/addons/l10n_it/data/account_chart.xml b/addons/l10n_it/data/l10n_it_chart_data.xml
index 2fd85f46887..2fd85f46887 100644
--- a/addons/l10n_it/data/account_chart.xml
+++ b/addons/l10n_it/data/l10n_it_chart_data.xml
diff --git a/addons/l10n_jp/__openerp__.py b/addons/l10n_jp/__openerp__.py
index 4c0a1c89c95..63815aabf71 100644
--- a/addons/l10n_jp/__openerp__.py
+++ b/addons/l10n_jp/__openerp__.py
@@ -30,11 +30,11 @@ need to use these at all under normal circumstances.
     'website': 'http://www.openerp-asia.net/',
     'depends': ['account'],
     'data': [
-        'data/account_chart_template.xml',
+        'data/l10n_jp_chart_data.xml',
         'data/account.account.template.csv',
         'data/account.tax.template.csv',
-        'data/account_chart_template_after.xml',
-        'data/account_chart_template.yml',
+        'data/account_chart_template_data.xml',
+        'data/account_chart_template_data.yml',
         'data/account.fiscal.position.template.csv',
     ],
     'installable': True,
diff --git a/addons/l10n_jp/data/account_chart_template_after.xml b/addons/l10n_jp/data/account_chart_template_data.xml
index b5e73af7a02..b5e73af7a02 100644
--- a/addons/l10n_jp/data/account_chart_template_after.xml
+++ b/addons/l10n_jp/data/account_chart_template_data.xml
diff --git a/addons/l10n_jp/data/account_chart_template.yml b/addons/l10n_jp/data/account_chart_template_data.yml
index a95927840ce..a95927840ce 100644
--- a/addons/l10n_jp/data/account_chart_template.yml
+++ b/addons/l10n_jp/data/account_chart_template_data.yml
diff --git a/addons/l10n_jp/data/account_chart_template.xml b/addons/l10n_jp/data/l10n_jp_chart_data.xml
index 72b5ad2e13c..72b5ad2e13c 100644
--- a/addons/l10n_jp/data/account_chart_template.xml
+++ b/addons/l10n_jp/data/l10n_jp_chart_data.xml
diff --git a/addons/l10n_lu/__openerp__.py b/addons/l10n_lu/__openerp__.py
index a90a93acbad..b263208e1d1 100644
--- a/addons/l10n_lu/__openerp__.py
+++ b/addons/l10n_lu/__openerp__.py
@@ -27,17 +27,17 @@ Notes:
     'depends': ['account', 'base_vat', 'base_iban'],
     'data': [
         # basic accounting data
-        'account_financial_report.xml',
-        'account_financial_report_abr.xml',
-        'account_chart_template.xml',
-        'account.account.template-2011.csv',
-        'account.account.tag.csv',
-        'account.tax.template-2015.csv',
-        'account.fiscal.position.template-2011.csv',
-        'account.fiscal.position.tax.template-2015.csv',
+        'data/account_financial_report_data.xml',
+        'data/account_financial_report_abr_data.xml',
+        'data/l10n_lu_chart_data.xml',
+        'data/account.account.template-2011.csv',
+        'data/account.account.tag.csv',
+        'data/account.tax.template-2015.csv',
+        'data/account.fiscal.position.template-2011.csv',
+        'data/account.fiscal.position.tax.template-2015.csv',
         # configuration wizard, views, reports...
-        'account.chart.template.csv',
-        'account_chart_template.yml',
+        'data/account.chart.template.csv',
+        'data/account_chart_template_data.yml',
     ],
     'test': [],
     'demo': [],
diff --git a/addons/l10n_lu/account.account.tag.csv b/addons/l10n_lu/data/account.account.tag.csv
index e0200291232..e0200291232 100644
--- a/addons/l10n_lu/account.account.tag.csv
+++ b/addons/l10n_lu/data/account.account.tag.csv
diff --git a/addons/l10n_lu/account.account.template-2011.csv b/addons/l10n_lu/data/account.account.template-2011.csv
index 34f8cd48cc5..34f8cd48cc5 100644
--- a/addons/l10n_lu/account.account.template-2011.csv
+++ b/addons/l10n_lu/data/account.account.template-2011.csv
diff --git a/addons/l10n_lu/account.chart.template.csv b/addons/l10n_lu/data/account.chart.template.csv
index 19821d101af..19821d101af 100644
--- a/addons/l10n_lu/account.chart.template.csv
+++ b/addons/l10n_lu/data/account.chart.template.csv
diff --git a/addons/l10n_lu/account.fiscal.position.tax.template-2015.csv b/addons/l10n_lu/data/account.fiscal.position.tax.template-2015.csv
index aaaf7634bd8..aaaf7634bd8 100644
--- a/addons/l10n_lu/account.fiscal.position.tax.template-2015.csv
+++ b/addons/l10n_lu/data/account.fiscal.position.tax.template-2015.csv
diff --git a/addons/l10n_lu/account.fiscal.position.template-2011.csv b/addons/l10n_lu/data/account.fiscal.position.template-2011.csv
index 245edcd0513..245edcd0513 100644
--- a/addons/l10n_lu/account.fiscal.position.template-2011.csv
+++ b/addons/l10n_lu/data/account.fiscal.position.template-2011.csv
diff --git a/addons/l10n_lu/account.tax.template-2015.csv b/addons/l10n_lu/data/account.tax.template-2015.csv
index 9d614d72e34..9d614d72e34 100644
--- a/addons/l10n_lu/account.tax.template-2015.csv
+++ b/addons/l10n_lu/data/account.tax.template-2015.csv
diff --git a/addons/l10n_lu/account_chart_template.yml b/addons/l10n_lu/data/account_chart_template_data.yml
index 3b2d42c4ddd..3b2d42c4ddd 100644
--- a/addons/l10n_lu/account_chart_template.yml
+++ b/addons/l10n_lu/data/account_chart_template_data.yml
diff --git a/addons/l10n_lu/account_financial_report_abr.xml b/addons/l10n_lu/data/account_financial_report_abr_data.xml
index 5b4ca98168d..5b4ca98168d 100644
--- a/addons/l10n_lu/account_financial_report_abr.xml
+++ b/addons/l10n_lu/data/account_financial_report_abr_data.xml
diff --git a/addons/l10n_lu/account_financial_report.xml b/addons/l10n_lu/data/account_financial_report_data.xml
index 12b49dc7b33..12b49dc7b33 100644
--- a/addons/l10n_lu/account_financial_report.xml
+++ b/addons/l10n_lu/data/account_financial_report_data.xml
diff --git a/addons/l10n_lu/account_chart_template.xml b/addons/l10n_lu/data/l10n_lu_chart_data.xml
index c2090e3d25b..c2090e3d25b 100644
--- a/addons/l10n_lu/account_chart_template.xml
+++ b/addons/l10n_lu/data/l10n_lu_chart_data.xml
diff --git a/addons/l10n_ma/__openerp__.py b/addons/l10n_ma/__openerp__.py
index ba693889bc8..6d1147855f4 100644
--- a/addons/l10n_ma/__openerp__.py
+++ b/addons/l10n_ma/__openerp__.py
@@ -20,9 +20,9 @@ Seddik au cours du troisième trimestre 2010.""",
     'website': 'http://www.kazacube.com',
     'depends': ['base', 'account'],
     'data': [
-        'account_pcg_morocco.xml',
-        'l10n_ma_tax.xml',
-        'account_chart_template.yml',
+        'data/l10n_ma_chart_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'auto_install': False,
diff --git a/addons/l10n_ma/account_chart_template.yml b/addons/l10n_ma/data/account_chart_template_data.yml
index 907e49e0ebc..907e49e0ebc 100644
--- a/addons/l10n_ma/account_chart_template.yml
+++ b/addons/l10n_ma/data/account_chart_template_data.yml
diff --git a/addons/l10n_ma/l10n_ma_tax.xml b/addons/l10n_ma/data/account_tax_data.xml
index e9f64988315..e9f64988315 100644
--- a/addons/l10n_ma/l10n_ma_tax.xml
+++ b/addons/l10n_ma/data/account_tax_data.xml
diff --git a/addons/l10n_ma/account_pcg_morocco.xml b/addons/l10n_ma/data/l10n_ma_chart_data.xml
index 1ffc2cd9769..1ffc2cd9769 100644
--- a/addons/l10n_ma/account_pcg_morocco.xml
+++ b/addons/l10n_ma/data/l10n_ma_chart_data.xml
diff --git a/addons/l10n_mx/__openerp__.py b/addons/l10n_mx/__openerp__.py
index 565c7ff4f87..71aeb4a3712 100644
--- a/addons/l10n_mx/__openerp__.py
+++ b/addons/l10n_mx/__openerp__.py
@@ -33,9 +33,9 @@ With this module you will have:
     "depends": ["account", "base_vat"],
     "demo_xml": [],
     "data": [
-        "data/account_chart.xml",
-        "data/account_tax.xml",
-        "data/account_chart_template.yml",
+        "data/l10n_mx_chart_data.xml",
+        "data/account_tax_data.xml",
+        "data/account_chart_template_data.yml",
     ],
     "installable": True,
     "certificate": False,
diff --git a/addons/l10n_mx/data/account_chart_template.yml b/addons/l10n_mx/data/account_chart_template_data.yml
index 68d4d09b93a..68d4d09b93a 100644
--- a/addons/l10n_mx/data/account_chart_template.yml
+++ b/addons/l10n_mx/data/account_chart_template_data.yml
diff --git a/addons/l10n_mx/data/account_tax.xml b/addons/l10n_mx/data/account_tax_data.xml
index 0f2c3dce488..0f2c3dce488 100644
--- a/addons/l10n_mx/data/account_tax.xml
+++ b/addons/l10n_mx/data/account_tax_data.xml
diff --git a/addons/l10n_mx/data/account_chart.xml b/addons/l10n_mx/data/l10n_mx_chart_data.xml
index 0a3d9fc1601..0a3d9fc1601 100644
--- a/addons/l10n_mx/data/account_chart.xml
+++ b/addons/l10n_mx/data/l10n_mx_chart_data.xml
diff --git a/addons/l10n_nl/__openerp__.py b/addons/l10n_nl/__openerp__.py
index 51b257eabb5..ca856cd4ef0 100644
--- a/addons/l10n_nl/__openerp__.py
+++ b/addons/l10n_nl/__openerp__.py
@@ -99,12 +99,12 @@ De extra cijfers worden dan achter het rekeningnummer aangevult met 'nullen'.
                  'base_vat',
                  'base_iban',
     ],
-    'data' : ['account_chart_netherlands.xml',
-              "account_fiscal_position_template.xml",
-              "account_fiscal_position_tax_template.xml",
-              "account_fiscal_position_account_template.xml",
-              "l10n_nl_account_chart.yml",
-    ],
+    'data': ['data/l10n_nl_chart_data.xml',
+             'data/account_tax_fiscal_position_data.xml',
+             'data/account_fiscal_position_tax_template_data.xml',
+             'data/account_fiscal_position_account_template_data.xml',
+             'data/account_chart_template_data.yml',
+             ],
     'demo' : [],
     'installable': True,
 }
diff --git a/addons/l10n_nl/l10n_nl_account_chart.yml b/addons/l10n_nl/data/account_chart_template_data.yml
index b118dee4d33..b118dee4d33 100644
--- a/addons/l10n_nl/l10n_nl_account_chart.yml
+++ b/addons/l10n_nl/data/account_chart_template_data.yml
diff --git a/addons/l10n_nl/account_fiscal_position_account_template.xml b/addons/l10n_nl/data/account_fiscal_position_account_template_data.xml
index b4dc5c58eb6..b4dc5c58eb6 100644
--- a/addons/l10n_nl/account_fiscal_position_account_template.xml
+++ b/addons/l10n_nl/data/account_fiscal_position_account_template_data.xml
diff --git a/addons/l10n_nl/account_fiscal_position_tax_template.xml b/addons/l10n_nl/data/account_fiscal_position_tax_template_data.xml
index 9fe9a3df786..9fe9a3df786 100644
--- a/addons/l10n_nl/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_nl/data/account_fiscal_position_tax_template_data.xml
diff --git a/addons/l10n_nl/account_fiscal_position_template.xml b/addons/l10n_nl/data/account_tax_fiscal_position_data.xml
index 1c69f2d1198..1c69f2d1198 100644
--- a/addons/l10n_nl/account_fiscal_position_template.xml
+++ b/addons/l10n_nl/data/account_tax_fiscal_position_data.xml
diff --git a/addons/l10n_nl/account_chart_netherlands.xml b/addons/l10n_nl/data/l10n_nl_chart_data.xml
index 5ba4966c5e9..5ba4966c5e9 100644
--- a/addons/l10n_nl/account_chart_netherlands.xml
+++ b/addons/l10n_nl/data/l10n_nl_chart_data.xml
diff --git a/addons/l10n_no/__openerp__.py b/addons/l10n_no/__openerp__.py
index 28b05ec1bad..73f27929e44 100644
--- a/addons/l10n_no/__openerp__.py
+++ b/addons/l10n_no/__openerp__.py
@@ -12,8 +12,9 @@ Updated for Odoo 9 by Bringsvor Consulting AS <www.bringsvor.com>
 """,
     "depends" : ["account", "base_iban", "base_vat"],
     "demo_xml" : [],
-    "data" : ["account_chart.xml",
-                    'account_tax.xml','account_chart_template.yml'],
+    "data": ['data/l10n_no_chart_data.xml',
+             'data/account_tax_data.xml',
+             'data/account_chart_template_data.yml'],
     "active": False,
     "installable": True
 }
diff --git a/addons/l10n_no/account_chart_template.yml b/addons/l10n_no/data/account_chart_template_data.yml
index f12b8a66afa..f12b8a66afa 100644
--- a/addons/l10n_no/account_chart_template.yml
+++ b/addons/l10n_no/data/account_chart_template_data.yml
diff --git a/addons/l10n_no/account_tax.xml b/addons/l10n_no/data/account_tax_data.xml
index 4b786317ac5..4b786317ac5 100644
--- a/addons/l10n_no/account_tax.xml
+++ b/addons/l10n_no/data/account_tax_data.xml
diff --git a/addons/l10n_no/account_chart.xml b/addons/l10n_no/data/l10n_no_chart_data.xml
index 91bb837a0a4..91bb837a0a4 100644
--- a/addons/l10n_no/account_chart.xml
+++ b/addons/l10n_no/data/l10n_no_chart_data.xml
diff --git a/addons/l10n_nz/__openerp__.py b/addons/l10n_nz/__openerp__.py
index 79535c29a20..11a1b1e11c8 100644
--- a/addons/l10n_nz/__openerp__.py
+++ b/addons/l10n_nz/__openerp__.py
@@ -21,14 +21,14 @@ Also:
     'website': 'http://www.willowit.com',
     'depends': ['account'],
     'data': [
-             'data/account_chart_template.xml',
+             'data/l10n_nz_chart_data.xml',
              'data/account.account.template.csv',
-             'data/account_chart_template_refs.xml',
+             'data/account_chart_template_data.xml',
              'data/account.account.tag.csv',
              'data/account.tax.template.csv',
-             'data/account_fiscal_position_tax_template.xml',
-             'data/account_chart_template.yml',
-             'data/localisation.xml',
+             'data/account_fiscal_position_tax_template_data.xml',
+             'data/account_chart_template_data.yml',
+             'data/res_currency_data.xml',
              ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_nz/data/account_chart_template_refs.xml b/addons/l10n_nz/data/account_chart_template_data.xml
index 22b90754a78..22b90754a78 100644
--- a/addons/l10n_nz/data/account_chart_template_refs.xml
+++ b/addons/l10n_nz/data/account_chart_template_data.xml
diff --git a/addons/l10n_nz/data/account_chart_template.yml b/addons/l10n_nz/data/account_chart_template_data.yml
index 9d1fe5c179f..9d1fe5c179f 100644
--- a/addons/l10n_nz/data/account_chart_template.yml
+++ b/addons/l10n_nz/data/account_chart_template_data.yml
diff --git a/addons/l10n_nz/data/account_fiscal_position_tax_template.xml b/addons/l10n_nz/data/account_fiscal_position_tax_template_data.xml
index ff84e581191..ff84e581191 100644
--- a/addons/l10n_nz/data/account_fiscal_position_tax_template.xml
+++ b/addons/l10n_nz/data/account_fiscal_position_tax_template_data.xml
diff --git a/addons/l10n_nz/data/account_chart_template.xml b/addons/l10n_nz/data/l10n_nz_chart_data.xml
index 643498f61dc..643498f61dc 100644
--- a/addons/l10n_nz/data/account_chart_template.xml
+++ b/addons/l10n_nz/data/l10n_nz_chart_data.xml
diff --git a/addons/l10n_nz/data/localisation.xml b/addons/l10n_nz/data/res_currency_data.xml
index 8b51f12c532..8b51f12c532 100644
--- a/addons/l10n_nz/data/localisation.xml
+++ b/addons/l10n_nz/data/res_currency_data.xml
diff --git a/addons/l10n_pa/__openerp__.py b/addons/l10n_pa/__openerp__.py
index 40fa9338770..16ed18f7ec4 100644
--- a/addons/l10n_pa/__openerp__.py
+++ b/addons/l10n_pa/__openerp__.py
@@ -20,9 +20,9 @@ Con la Colaboración de
     'category': 'Localization',
     "depends": ["account"],
     "data": [
-        "l10n_pa_chart.xml",
-        "account_tax.xml",
-        "account_chart_template.yml",
+        "data/l10n_pa_chart_data.xml",
+        "data/account_tax_data.xml",
+        "data/account_chart_template_data.yml",
     ],
     "demo_xml": [],
     "installable": True,
diff --git a/addons/l10n_pa/account_chart_template.yml b/addons/l10n_pa/data/account_chart_template_data.yml
index 690f8337414..690f8337414 100644
--- a/addons/l10n_pa/account_chart_template.yml
+++ b/addons/l10n_pa/data/account_chart_template_data.yml
diff --git a/addons/l10n_pa/account_tax.xml b/addons/l10n_pa/data/account_tax_data.xml
index f3873458e90..f3873458e90 100644
--- a/addons/l10n_pa/account_tax.xml
+++ b/addons/l10n_pa/data/account_tax_data.xml
diff --git a/addons/l10n_pa/l10n_pa_chart.xml b/addons/l10n_pa/data/l10n_pa_chart_data.xml
index cfbdbc16a52..cfbdbc16a52 100644
--- a/addons/l10n_pa/l10n_pa_chart.xml
+++ b/addons/l10n_pa/data/l10n_pa_chart_data.xml
diff --git a/addons/l10n_pe/__openerp__.py b/addons/l10n_pe/__openerp__.py
index 5bcae9eb55d..8aa8faff4c4 100644
--- a/addons/l10n_pe/__openerp__.py
+++ b/addons/l10n_pe/__openerp__.py
@@ -18,10 +18,10 @@ SUNAT 2011 (PCGE 2010).
     'website': 'http://cubicERP.com',
     'category': 'Localization',
     'depends': ['account'],
-    'data':[
-        'l10n_pe_chart.xml',
-        'account_tax.xml',
-        'account_chart_template.yml',
+    'data': [
+        'data/l10n_pe_chart_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'active': False,
diff --git a/addons/l10n_pe/account_chart_template.yml b/addons/l10n_pe/data/account_chart_template_data.yml
index 77294fe9cbc..77294fe9cbc 100644
--- a/addons/l10n_pe/account_chart_template.yml
+++ b/addons/l10n_pe/data/account_chart_template_data.yml
diff --git a/addons/l10n_pe/account_tax.xml b/addons/l10n_pe/data/account_tax_data.xml
index 920702b0c80..920702b0c80 100644
--- a/addons/l10n_pe/account_tax.xml
+++ b/addons/l10n_pe/data/account_tax_data.xml
diff --git a/addons/l10n_pe/l10n_pe_chart.xml b/addons/l10n_pe/data/l10n_pe_chart_data.xml
index f271c7a7139..f271c7a7139 100644
--- a/addons/l10n_pe/l10n_pe_chart.xml
+++ b/addons/l10n_pe/data/l10n_pe_chart_data.xml
diff --git a/addons/l10n_pl/__openerp__.py b/addons/l10n_pl/__openerp__.py
index 734e5bfc6ce..c0842fe0ed3 100644
--- a/addons/l10n_pl/__openerp__.py
+++ b/addons/l10n_pl/__openerp__.py
@@ -22,12 +22,12 @@ Wewnętrzny numer wersji OpenGLOBE 1.02
     """,
     'depends' : ['account', 'base_iban', 'base_vat'],
     'demo' : [],
-    'data' : [
-              'account_chart.xml',
-              'account_tax.xml',
-              'fiscal_position.xml',
-              'country_pl.xml',
-              'account_chart_template.yml'
+    'data': [
+              'data/l10n_pl_chart_data.xml',
+              'data/account_tax_data.xml',
+              'data/account_fiscal_position_data.xml',
+              'data/res_country_state_data.xml',
+              'data/account_chart_template_data.yml'
     ],
     'installable': True,
 }
diff --git a/addons/l10n_pl/account_chart_template.yml b/addons/l10n_pl/data/account_chart_template_data.yml
index c3399da7918..c3399da7918 100644
--- a/addons/l10n_pl/account_chart_template.yml
+++ b/addons/l10n_pl/data/account_chart_template_data.yml
diff --git a/addons/l10n_pl/fiscal_position.xml b/addons/l10n_pl/data/account_fiscal_position_data.xml
index 46627c60cd5..46627c60cd5 100644
--- a/addons/l10n_pl/fiscal_position.xml
+++ b/addons/l10n_pl/data/account_fiscal_position_data.xml
diff --git a/addons/l10n_pl/account_tax.xml b/addons/l10n_pl/data/account_tax_data.xml
index 88cd7707782..88cd7707782 100644
--- a/addons/l10n_pl/account_tax.xml
+++ b/addons/l10n_pl/data/account_tax_data.xml
diff --git a/addons/l10n_pl/account_chart.xml b/addons/l10n_pl/data/l10n_pl_chart_data.xml
index 751cbf36a4e..751cbf36a4e 100644
--- a/addons/l10n_pl/account_chart.xml
+++ b/addons/l10n_pl/data/l10n_pl_chart_data.xml
diff --git a/addons/l10n_pl/country_pl.xml b/addons/l10n_pl/data/res_country_state_data.xml
index 0b3d45c6d15..0b3d45c6d15 100644
--- a/addons/l10n_pl/country_pl.xml
+++ b/addons/l10n_pl/data/res_country_state_data.xml
diff --git a/addons/l10n_ro/__init__.py b/addons/l10n_ro/__init__.py
index e9399e45d8a..50a76046010 100644
--- a/addons/l10n_ro/__init__.py
+++ b/addons/l10n_ro/__init__.py
@@ -7,4 +7,4 @@
 # Copyright (C) 2011 TOTAL PC SYSTEMS (http://www.erpsystems.ro).
 # Copyright (C) 2009 (<http://www.filsystem.ro>)
 
-import res_partner
+import models
diff --git a/addons/l10n_ro/__openerp__.py b/addons/l10n_ro/__openerp__.py
index b4b39c04ff5..86bfc6fa566 100644
--- a/addons/l10n_ro/__openerp__.py
+++ b/addons/l10n_ro/__openerp__.py
@@ -22,13 +22,13 @@ It also adds the Registration Number for Romania in Odoo.
 Romanian accounting chart and localization.
     """,
     "demo" : [],
-    "data" : ['partner_view.xml',
-              'account_chart.xml',
-              'account_tax_template.xml',
-              'fiscal_position_template.xml',
-              'account_chart_template.yml',
-              'res.country.state.csv',
-              'res.bank.csv',
-              ],
+    "data": ['views/res_partner_view.xml',
+             'data/l10n_ro_chart_data.xml',
+             'data/account_tax_data.xml',
+             'data/account_fiscal_position_data.xml',
+             'data/account_chart_template_data.yml',
+             'data/res.country.state.csv',
+             'data/res.bank.csv',
+             ],
     "installable": True,
 }
diff --git a/addons/l10n_ro/account_chart_template.yml b/addons/l10n_ro/data/account_chart_template_data.yml
index 9d8901444fe..9d8901444fe 100644
--- a/addons/l10n_ro/account_chart_template.yml
+++ b/addons/l10n_ro/data/account_chart_template_data.yml
diff --git a/addons/l10n_ro/fiscal_position_template.xml b/addons/l10n_ro/data/account_fiscal_position_data.xml
index 6a737fdbeb6..6a737fdbeb6 100644
--- a/addons/l10n_ro/fiscal_position_template.xml
+++ b/addons/l10n_ro/data/account_fiscal_position_data.xml
diff --git a/addons/l10n_ro/account_tax_template.xml b/addons/l10n_ro/data/account_tax_data.xml
index b6ad4627d74..b6ad4627d74 100644
--- a/addons/l10n_ro/account_tax_template.xml
+++ b/addons/l10n_ro/data/account_tax_data.xml
diff --git a/addons/l10n_ro/account_chart.xml b/addons/l10n_ro/data/l10n_ro_chart_data.xml
index 3a16abb14dd..3a16abb14dd 100644
--- a/addons/l10n_ro/account_chart.xml
+++ b/addons/l10n_ro/data/l10n_ro_chart_data.xml
diff --git a/addons/l10n_ro/res.bank.csv b/addons/l10n_ro/data/res.bank.csv
index 470264c01c9..470264c01c9 100755
--- a/addons/l10n_ro/res.bank.csv
+++ b/addons/l10n_ro/data/res.bank.csv
diff --git a/addons/l10n_ro/res.country.state.csv b/addons/l10n_ro/data/res.country.state.csv
index 65bebcc2a5f..65bebcc2a5f 100644
--- a/addons/l10n_ro/res.country.state.csv
+++ b/addons/l10n_ro/data/res.country.state.csv
diff --git a/addons/l10n_ro/models/__init__.py b/addons/l10n_ro/models/__init__.py
new file mode 100644
index 00000000000..1e3dc5a9c2b
--- /dev/null
+++ b/addons/l10n_ro/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import res_partner
diff --git a/addons/l10n_ro/res_partner.py b/addons/l10n_ro/models/res_partner.py
index b0da3193eca..b0da3193eca 100644
--- a/addons/l10n_ro/res_partner.py
+++ b/addons/l10n_ro/models/res_partner.py
diff --git a/addons/l10n_ro/partner_view.xml b/addons/l10n_ro/views/res_partner_view.xml
index 93858de39f8..93858de39f8 100644
--- a/addons/l10n_ro/partner_view.xml
+++ b/addons/l10n_ro/views/res_partner_view.xml
diff --git a/addons/l10n_sa/__openerp__.py b/addons/l10n_sa/__openerp__.py
index 4c7d4b9f037..d7c6b74203a 100644
--- a/addons/l10n_sa/__openerp__.py
+++ b/addons/l10n_sa/__openerp__.py
@@ -15,10 +15,10 @@ In future this module will include some payroll rules for ME .
     'website': 'http://www.dvit.me',
     'depends': ['account', 'l10n_multilang'],
     'data': [
-        'account.chart.template.xml',
-        'account.account.template.csv',
-        'account_chart_template_after.xml',
-        'account_chart_template.yml',
+        'data/account_chart_template_data.xml',
+        'data/account.account.template.csv',
+        'data/l10n_sa_chart_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'test': [],
diff --git a/addons/l10n_sa/account.account.template.csv b/addons/l10n_sa/data/account.account.template.csv
index 3fabfcfc694..3fabfcfc694 100644
--- a/addons/l10n_sa/account.account.template.csv
+++ b/addons/l10n_sa/data/account.account.template.csv
diff --git a/addons/l10n_sa/account.chart.template.xml b/addons/l10n_sa/data/account_chart_template_data.xml
index d90eaa1779f..d90eaa1779f 100644
--- a/addons/l10n_sa/account.chart.template.xml
+++ b/addons/l10n_sa/data/account_chart_template_data.xml
diff --git a/addons/l10n_sa/account_chart_template.yml b/addons/l10n_sa/data/account_chart_template_data.yml
index d52f71fc946..d52f71fc946 100644
--- a/addons/l10n_sa/account_chart_template.yml
+++ b/addons/l10n_sa/data/account_chart_template_data.yml
diff --git a/addons/l10n_sa/account_chart_template_after.xml b/addons/l10n_sa/data/l10n_sa_chart_data.xml
index 25b924cdb30..25b924cdb30 100644
--- a/addons/l10n_sa/account_chart_template_after.xml
+++ b/addons/l10n_sa/data/l10n_sa_chart_data.xml
diff --git a/addons/l10n_sg/__openerp__.py b/addons/l10n_sg/__openerp__.py
index 6a5366c8e8a..44361d6d83c 100644
--- a/addons/l10n_sg/__openerp__.py
+++ b/addons/l10n_sg/__openerp__.py
@@ -29,9 +29,9 @@ After installing this module, the Configuration wizard for accounting is launche
     'depends': ['base', 'account'],
     'demo': [ ],
     'data': [
-             'l10n_sg_chart.xml',
-             'l10n_sg_chart_tax.xml',
-             'account_chart_template.yml',
+             'data/l10n_sg_chart_data.xml',
+             'data/account_tax_data.xml',
+             'data/account_chart_template_data.yml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_sg/account_chart_template.yml b/addons/l10n_sg/data/account_chart_template_data.yml
index e7bb9f5aed4..e7bb9f5aed4 100644
--- a/addons/l10n_sg/account_chart_template.yml
+++ b/addons/l10n_sg/data/account_chart_template_data.yml
diff --git a/addons/l10n_sg/l10n_sg_chart_tax.xml b/addons/l10n_sg/data/account_tax_data.xml
index 9c241de0e4c..9c241de0e4c 100644
--- a/addons/l10n_sg/l10n_sg_chart_tax.xml
+++ b/addons/l10n_sg/data/account_tax_data.xml
diff --git a/addons/l10n_sg/l10n_sg_chart.xml b/addons/l10n_sg/data/l10n_sg_chart_data.xml
index d31b3c776c2..d31b3c776c2 100644
--- a/addons/l10n_sg/l10n_sg_chart.xml
+++ b/addons/l10n_sg/data/l10n_sg_chart_data.xml
diff --git a/addons/l10n_si/__openerp__.py b/addons/l10n_si/__openerp__.py
index 2c522ed9f1d..dbbab1f4fc9 100644
--- a/addons/l10n_si/__openerp__.py
+++ b/addons/l10n_si/__openerp__.py
@@ -12,7 +12,7 @@
     "description": "Kontni načrt za gospodarske družbe",
     "depends": ["account", "base_iban", "base_vat", "account_cancel"],
     "data": [
-        "data/account_chart_template.xml",
+        "data/l10n_si_chart_data.xml",
         "data/account.account.template.csv",
         "data/account.chart.template.csv",
         'data/account.account.tag.csv',
@@ -20,7 +20,7 @@
         "data/account.fiscal.position.template.csv",
         "data/account.fiscal.position.account.template.csv",
         "data/account.fiscal.position.tax.template.csv",
-        "data/account_chart_template.yml",
+        "data/account_chart_template_data.yml",
     ],
     "installable": True,
 }
diff --git a/addons/l10n_si/data/account_chart_template.yml b/addons/l10n_si/data/account_chart_template_data.yml
index 87caf7b2f93..87caf7b2f93 100644
--- a/addons/l10n_si/data/account_chart_template.yml
+++ b/addons/l10n_si/data/account_chart_template_data.yml
diff --git a/addons/l10n_si/data/account_chart_template.xml b/addons/l10n_si/data/l10n_si_chart_data.xml
index 3d04dbd2b6e..3d04dbd2b6e 100644
--- a/addons/l10n_si/data/account_chart_template.xml
+++ b/addons/l10n_si/data/l10n_si_chart_data.xml
diff --git a/addons/l10n_syscohada/__openerp__.py b/addons/l10n_syscohada/__openerp__.py
index 3441bbd56d4..91260189e9d 100644
--- a/addons/l10n_syscohada/__openerp__.py
+++ b/addons/l10n_syscohada/__openerp__.py
@@ -26,9 +26,9 @@ Countries that use OHADA are the following:
     'website': 'http://www.baamtu.com',
     'depends' : ['account', 'base_vat'],
     'demo' : [],
-    'data' : [
-        'l10n_syscohada_data.xml',
-        'account_chart_template.yml',
+    'data': [
+        'data/l10n_syscohada_chart_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'installable': True
 }
diff --git a/addons/l10n_syscohada/account_chart_template.yml b/addons/l10n_syscohada/data/account_chart_template_data.yml
index ed6dcaaa2b3..ed6dcaaa2b3 100644
--- a/addons/l10n_syscohada/account_chart_template.yml
+++ b/addons/l10n_syscohada/data/account_chart_template_data.yml
diff --git a/addons/l10n_syscohada/l10n_syscohada_data.xml b/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml
index 6eaa1451714..6eaa1451714 100644
--- a/addons/l10n_syscohada/l10n_syscohada_data.xml
+++ b/addons/l10n_syscohada/data/l10n_syscohada_chart_data.xml
diff --git a/addons/l10n_th/__openerp__.py b/addons/l10n_th/__openerp__.py
index 8b760d20fda..a5070885875 100644
--- a/addons/l10n_th/__openerp__.py
+++ b/addons/l10n_th/__openerp__.py
@@ -15,8 +15,8 @@ Thai accounting chart and localization.
     'website': 'http://almacom.co.th/',
     'depends': ['account'],
     'data': [
-        'account_data.xml',
-        'account_chart_template.yml',
+        'data/l10n_th_chart_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'installable': True,
 }
diff --git a/addons/l10n_th/account_chart_template.yml b/addons/l10n_th/data/account_chart_template_data.yml
index 99bbac243aa..99bbac243aa 100644
--- a/addons/l10n_th/account_chart_template.yml
+++ b/addons/l10n_th/data/account_chart_template_data.yml
diff --git a/addons/l10n_th/account_data.xml b/addons/l10n_th/data/l10n_th_chart_data.xml
index e1939abc979..e1939abc979 100644
--- a/addons/l10n_th/account_data.xml
+++ b/addons/l10n_th/data/l10n_th_chart_data.xml
diff --git a/addons/l10n_tr/__openerp__.py b/addons/l10n_tr/__openerp__.py
index 669b662cd49..04dffaae53f 100644
--- a/addons/l10n_tr/__openerp__.py
+++ b/addons/l10n_tr/__openerp__.py
@@ -20,9 +20,9 @@ Bu modül kurulduktan sonra, Muhasebe yapılandırma sihirbazı çalışır
         'base_vat',
     ],
     'data': [
-        'account_tdhp_turkey.xml',
-        'account_tax_template.xml',
-        'account_chart_template.yml',
+        'data/l10n_tr_chart_data.xml',
+        'data/account_tax_template_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_tr/account_chart_template.yml b/addons/l10n_tr/data/account_chart_template_data.yml
index 895dbd72db5..895dbd72db5 100644
--- a/addons/l10n_tr/account_chart_template.yml
+++ b/addons/l10n_tr/data/account_chart_template_data.yml
diff --git a/addons/l10n_tr/account_tax_template.xml b/addons/l10n_tr/data/account_tax_template_data.xml
index 296347cf39c..296347cf39c 100644
--- a/addons/l10n_tr/account_tax_template.xml
+++ b/addons/l10n_tr/data/account_tax_template_data.xml
diff --git a/addons/l10n_tr/account_tdhp_turkey.xml b/addons/l10n_tr/data/l10n_tr_chart_data.xml
index de4f1daff3b..de4f1daff3b 100644
--- a/addons/l10n_tr/account_tdhp_turkey.xml
+++ b/addons/l10n_tr/data/l10n_tr_chart_data.xml
diff --git a/addons/l10n_uk/__openerp__.py b/addons/l10n_uk/__openerp__.py
index 39bd8ca0062..e9bd53ce8b3 100644
--- a/addons/l10n_uk/__openerp__.py
+++ b/addons/l10n_uk/__openerp__.py
@@ -18,14 +18,14 @@ This is the latest UK Odoo localisation necessary to run Odoo accounting for UK
     'website': 'http://www.smartmode.co.uk',
     'depends': ['base_iban', 'base_vat'],
     'data': [
-        'data/account_chart_template.xml',
+        'data/l10n_uk_chart_data.xml',
         'data/account.account.template.csv',
         'data/account.chart.template.csv',
         'data/account.account.tag.csv',
         'data/account.tax.template.csv',
         'data/res.country.state.csv',
-        'data/account_chart_template.yml',
+        'data/account_chart_template_data.yml',
     ],
-    'demo' : ['demo/demo.xml'],
+    'demo' : ['demo/l10n_uk_demo.xml'],
     'installable': True,
 }
diff --git a/addons/l10n_uk/data/account_chart_template.yml b/addons/l10n_uk/data/account_chart_template_data.yml
index 5aed3b2afb3..5aed3b2afb3 100644
--- a/addons/l10n_uk/data/account_chart_template.yml
+++ b/addons/l10n_uk/data/account_chart_template_data.yml
diff --git a/addons/l10n_uk/data/account_chart_template.xml b/addons/l10n_uk/data/l10n_uk_chart_data.xml
index 28a9308f60c..28a9308f60c 100644
--- a/addons/l10n_uk/data/account_chart_template.xml
+++ b/addons/l10n_uk/data/l10n_uk_chart_data.xml
diff --git a/addons/l10n_uk/demo/demo.xml b/addons/l10n_uk/demo/l10n_uk_demo.xml
index 495b78b2289..495b78b2289 100644
--- a/addons/l10n_uk/demo/demo.xml
+++ b/addons/l10n_uk/demo/l10n_uk_demo.xml
diff --git a/addons/l10n_us/__openerp__.py b/addons/l10n_us/__openerp__.py
index feca0161fb9..f6e335c5ba1 100644
--- a/addons/l10n_us/__openerp__.py
+++ b/addons/l10n_us/__openerp__.py
@@ -10,8 +10,8 @@ United States - Chart of accounts.
     """,
     'depends': ['l10n_generic_coa', 'report'],
     'data': [
-        'data/res_company.xml',
-        'views/res_config_view.xml'
+        'views/res_config_view.xml',
+        'data/res_company_data.xml',
     ],
     'demo': [],
     'test': [],
diff --git a/addons/l10n_us/data/res_company.xml b/addons/l10n_us/data/res_company_data.xml
index 094a527132b..094a527132b 100644
--- a/addons/l10n_us/data/res_company.xml
+++ b/addons/l10n_us/data/res_company_data.xml
diff --git a/addons/l10n_uy/__openerp__.py b/addons/l10n_uy/__openerp__.py
index e6f965bcb9a..53d66855906 100644
--- a/addons/l10n_uy/__openerp__.py
+++ b/addons/l10n_uy/__openerp__.py
@@ -16,9 +16,9 @@ Provide Templates for Chart of Accounts, Taxes for Uruguay.
 """,
     'depends': ['account'],
     'data': [
-        'account_chart_template.xml',
-        'taxes_template.xml',
-        'account_chart_template.yml',
+        'data/l10n_uy_chart_data.xml',
+        'data/account_tax_data.xml',
+        'data/account_chart_template_data.yml',
     ],
     'demo': [],
     'installable': True,
diff --git a/addons/l10n_uy/account_chart_template.yml b/addons/l10n_uy/data/account_chart_template_data.yml
index a68f874bef3..a68f874bef3 100644
--- a/addons/l10n_uy/account_chart_template.yml
+++ b/addons/l10n_uy/data/account_chart_template_data.yml
diff --git a/addons/l10n_uy/taxes_template.xml b/addons/l10n_uy/data/account_tax_data.xml
index a39b41cc611..a39b41cc611 100644
--- a/addons/l10n_uy/taxes_template.xml
+++ b/addons/l10n_uy/data/account_tax_data.xml
diff --git a/addons/l10n_uy/account_chart_template.xml b/addons/l10n_uy/data/l10n_uy_chart_data.xml
index 683078bf59d..683078bf59d 100644
--- a/addons/l10n_uy/account_chart_template.xml
+++ b/addons/l10n_uy/data/l10n_uy_chart_data.xml
diff --git a/addons/l10n_ve/__openerp__.py b/addons/l10n_ve/__openerp__.py
index b4ebe3331b3..eec8c856e00 100644
--- a/addons/l10n_ve/__openerp__.py
+++ b/addons/l10n_ve/__openerp__.py
@@ -46,9 +46,9 @@ but you will need set manually account defaults for taxes.
     ],
     'demo': [],
     'data': [
-             'data/account_chart.xml',
-             'data/account_tax.xml',
-             'data/account_chart_template.yml'
+             'data/l10n_ve_chart_data.xml',
+             'data/account_tax_data.xml',
+             'data/account_chart_template_data.yml'
     ],
     'installable': True,
 }
diff --git a/addons/l10n_ve/data/account_chart_template.yml b/addons/l10n_ve/data/account_chart_template_data.yml
index f045ff4ccad..f045ff4ccad 100644
--- a/addons/l10n_ve/data/account_chart_template.yml
+++ b/addons/l10n_ve/data/account_chart_template_data.yml
diff --git a/addons/l10n_ve/data/account_tax.xml b/addons/l10n_ve/data/account_tax_data.xml
index eb0b625907e..eb0b625907e 100644
--- a/addons/l10n_ve/data/account_tax.xml
+++ b/addons/l10n_ve/data/account_tax_data.xml
diff --git a/addons/l10n_ve/data/account_chart.xml b/addons/l10n_ve/data/l10n_ve_chart_data.xml
index ff025cc5dc3..ff025cc5dc3 100644
--- a/addons/l10n_ve/data/account_chart.xml
+++ b/addons/l10n_ve/data/l10n_ve_chart_data.xml
diff --git a/addons/l10n_vn/__openerp__.py b/addons/l10n_vn/__openerp__.py
index 5ea1e136a73..df5d3e18046 100644
--- a/addons/l10n_vn/__openerp__.py
+++ b/addons/l10n_vn/__openerp__.py
@@ -18,7 +18,9 @@ This module applies to companies based in Vietnamese Accounting Standard (VAS).
 **Credits:** General Solutions.
 """,
     "depends" : ["account","base_vat","base_iban"],
-    "data" : ["account_chart.xml","account_tax.xml","account_chart_template.yml"],
+    "data": ['data/l10n_vn_chart_data.xml',
+             'data/account_tax_data.xml',
+             'data/account_chart_template_data.yml'],
     "demo" : [],
     "installable": True,
 }
diff --git a/addons/l10n_vn/account_chart_template.yml b/addons/l10n_vn/data/account_chart_template_data.yml
index 1454624dc4c..1454624dc4c 100644
--- a/addons/l10n_vn/account_chart_template.yml
+++ b/addons/l10n_vn/data/account_chart_template_data.yml
diff --git a/addons/l10n_vn/account_tax.xml b/addons/l10n_vn/data/account_tax_data.xml
index 107ef8ba626..107ef8ba626 100644
--- a/addons/l10n_vn/account_tax.xml
+++ b/addons/l10n_vn/data/account_tax_data.xml
diff --git a/addons/l10n_vn/account_chart.xml b/addons/l10n_vn/data/l10n_vn_chart_data.xml
index 128c03be358..128c03be358 100644
--- a/addons/l10n_vn/account_chart.xml
+++ b/addons/l10n_vn/data/l10n_vn_chart_data.xml