diff --git a/addons/hr_payroll/__init__.py b/addons/hr_payroll/__init__.py
index f0e059ee139..eb1374bb65e 100644
--- a/addons/hr_payroll/__init__.py
+++ b/addons/hr_payroll/__init__.py
@@ -1,8 +1,6 @@
 #-*- coding:utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import hr_payroll
+import models
 import report
 import wizard
-
-import res_config
diff --git a/addons/hr_payroll/__openerp__.py b/addons/hr_payroll/__openerp__.py
index ca133ed1e1a..4e0ea4c1271 100644
--- a/addons/hr_payroll/__openerp__.py
+++ b/addons/hr_payroll/__openerp__.py
@@ -28,24 +28,24 @@ Generic Payroll system.
         'report',
     ],
     'data': [
-        'security/hr_security.xml',
-        'wizard/hr_payroll_payslips_by_employees.xml',
-        'hr_payroll_view.xml',
-        'hr_payroll_workflow.xml',
-        'hr_payroll_sequence.xml',
-        'hr_payroll_report.xml',
-        'hr_payroll_data.xml',
+        'security/hr_payroll_security.xml',
+        'wizard/hr_payroll_payslips_by_employees_views.xml',
+        'views/hr_payroll_views.xml',
+        'views/hr_payroll_workflow.xml',
+        'data/hr_payroll_sequence.xml',
+        'views/hr_payroll_report.xml',
+        'data/hr_payroll_data.xml',
         'security/ir.model.access.csv',
-        'wizard/hr_payroll_contribution_register_report.xml',
-        'res_config_view.xml',
-        'views/report_contributionregister.xml',
-        'views/report_payslip.xml',
-        'views/report_payslipdetails.xml',
+        'wizard/hr_payroll_contribution_register_report_views.xml',
+        'views/res_config_views.xml',
+        'views/report_contributionregister_templates.xml',
+        'views/report_payslip_templates.xml',
+        'views/report_payslipdetails_templates.xml',
     ],
     'test': [
         'test/payslip.yml',
     ],
-    'demo': ['hr_payroll_demo.xml'],
+    'demo': ['data/hr_payroll_demo.xml'],
     'installable': True,
     'auto_install': False,
     'application': False,
diff --git a/addons/hr_payroll/hr_payroll_data.xml b/addons/hr_payroll/data/hr_payroll_data.xml
similarity index 100%
rename from addons/hr_payroll/hr_payroll_data.xml
rename to addons/hr_payroll/data/hr_payroll_data.xml
diff --git a/addons/hr_payroll/hr_payroll_demo.xml b/addons/hr_payroll/data/hr_payroll_demo.xml
similarity index 100%
rename from addons/hr_payroll/hr_payroll_demo.xml
rename to addons/hr_payroll/data/hr_payroll_demo.xml
diff --git a/addons/hr_payroll/hr_payroll_sequence.xml b/addons/hr_payroll/data/hr_payroll_sequence.xml
similarity index 100%
rename from addons/hr_payroll/hr_payroll_sequence.xml
rename to addons/hr_payroll/data/hr_payroll_sequence.xml
diff --git a/addons/hr_payroll/models/__init__.py b/addons/hr_payroll/models/__init__.py
new file mode 100644
index 00000000000..c8c7a73abb8
--- /dev/null
+++ b/addons/hr_payroll/models/__init__.py
@@ -0,0 +1,5 @@
+#-*- coding:utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import hr_payroll
+import res_config
diff --git a/addons/hr_payroll/hr_payroll.py b/addons/hr_payroll/models/hr_payroll.py
similarity index 99%
rename from addons/hr_payroll/hr_payroll.py
rename to addons/hr_payroll/models/hr_payroll.py
index 0b612cac04c..7dedb79a76b 100644
--- a/addons/hr_payroll/hr_payroll.py
+++ b/addons/hr_payroll/models/hr_payroll.py
@@ -849,7 +849,7 @@ result = rules.NET > categories.NET * 0.10''',
         'quantity': '1.0',
      }
 
-    @api.cr_uid_ids_context
+    @api.cr_uid_records_context
     def _recursive_search_of_rules(self, cr, uid, rule_ids, context=None):
         """
         @param rule_ids: list of browse record
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/models/res_config.py
similarity index 100%
rename from addons/hr_payroll/res_config.py
rename to addons/hr_payroll/models/res_config.py
diff --git a/addons/hr_payroll/security/hr_security.xml b/addons/hr_payroll/security/hr_payroll_security.xml
similarity index 100%
rename from addons/hr_payroll/security/hr_security.xml
rename to addons/hr_payroll/security/hr_payroll_security.xml
diff --git a/addons/hr_payroll/hr_payroll_report.xml b/addons/hr_payroll/views/hr_payroll_report.xml
similarity index 100%
rename from addons/hr_payroll/hr_payroll_report.xml
rename to addons/hr_payroll/views/hr_payroll_report.xml
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/views/hr_payroll_views.xml
similarity index 100%
rename from addons/hr_payroll/hr_payroll_view.xml
rename to addons/hr_payroll/views/hr_payroll_views.xml
diff --git a/addons/hr_payroll/hr_payroll_workflow.xml b/addons/hr_payroll/views/hr_payroll_workflow.xml
similarity index 100%
rename from addons/hr_payroll/hr_payroll_workflow.xml
rename to addons/hr_payroll/views/hr_payroll_workflow.xml
diff --git a/addons/hr_payroll/views/report_contributionregister.xml b/addons/hr_payroll/views/report_contributionregister_templates.xml
similarity index 100%
rename from addons/hr_payroll/views/report_contributionregister.xml
rename to addons/hr_payroll/views/report_contributionregister_templates.xml
diff --git a/addons/hr_payroll/views/report_payslip.xml b/addons/hr_payroll/views/report_payslip_templates.xml
similarity index 100%
rename from addons/hr_payroll/views/report_payslip.xml
rename to addons/hr_payroll/views/report_payslip_templates.xml
diff --git a/addons/hr_payroll/views/report_payslipdetails.xml b/addons/hr_payroll/views/report_payslipdetails_templates.xml
similarity index 100%
rename from addons/hr_payroll/views/report_payslipdetails.xml
rename to addons/hr_payroll/views/report_payslipdetails_templates.xml
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/views/res_config_views.xml
similarity index 100%
rename from addons/hr_payroll/res_config_view.xml
rename to addons/hr_payroll/views/res_config_views.xml
diff --git a/addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml b/addons/hr_payroll/wizard/hr_payroll_contribution_register_report_views.xml
similarity index 100%
rename from addons/hr_payroll/wizard/hr_payroll_contribution_register_report.xml
rename to addons/hr_payroll/wizard/hr_payroll_contribution_register_report_views.xml
diff --git a/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml b/addons/hr_payroll/wizard/hr_payroll_payslips_by_employees_views.xml
similarity index 100%
rename from addons/hr_payroll/wizard/hr_payroll_payslips_by_employees.xml
rename to addons/hr_payroll/wizard/hr_payroll_payslips_by_employees_views.xml