diff --git a/addons/hr_contract/__init__.py b/addons/hr_contract/__init__.py
index 37a8783dca1..81fc81d29c9 100644
--- a/addons/hr_contract/__init__.py
+++ b/addons/hr_contract/__init__.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import hr_contract
-import base_action_rule
+import models
diff --git a/addons/hr_contract/__openerp__.py b/addons/hr_contract/__openerp__.py
index b0af5224eed..b4361b7c234 100644
--- a/addons/hr_contract/__openerp__.py
+++ b/addons/hr_contract/__openerp__.py
@@ -21,9 +21,9 @@ You can assign several contracts per employee.
     'depends': ['base_action_rule', 'hr'],
     'data': [
         'security/ir.model.access.csv',
-        'hr_contract_view.xml',
-        'hr_contract_data.xml',
-        'base_action_rule_view.xml',
+        'views/hr_contract_views.xml',
+        'data/hr_contract_data.xml',
+        'views/base_action_rule_views.xml',
     ],
     'demo': [],
     'test': ['test/test_hr_contract.yml'],
diff --git a/addons/hr_contract/hr_contract_data.xml b/addons/hr_contract/data/hr_contract_data.xml
similarity index 100%
rename from addons/hr_contract/hr_contract_data.xml
rename to addons/hr_contract/data/hr_contract_data.xml
diff --git a/addons/hr_contract/models/__init__.py b/addons/hr_contract/models/__init__.py
new file mode 100644
index 00000000000..06e596009c3
--- /dev/null
+++ b/addons/hr_contract/models/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import base_action_rule
+import hr_contract
diff --git a/addons/hr_contract/base_action_rule.py b/addons/hr_contract/models/base_action_rule.py
similarity index 100%
rename from addons/hr_contract/base_action_rule.py
rename to addons/hr_contract/models/base_action_rule.py
diff --git a/addons/hr_contract/hr_contract.py b/addons/hr_contract/models/hr_contract.py
similarity index 100%
rename from addons/hr_contract/hr_contract.py
rename to addons/hr_contract/models/hr_contract.py
diff --git a/addons/hr_contract/base_action_rule_view.xml b/addons/hr_contract/views/base_action_rule_views.xml
similarity index 100%
rename from addons/hr_contract/base_action_rule_view.xml
rename to addons/hr_contract/views/base_action_rule_views.xml
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/views/hr_contract_views.xml
similarity index 100%
rename from addons/hr_contract/hr_contract_view.xml
rename to addons/hr_contract/views/hr_contract_views.xml