diff --git a/addons/mrp_repair/__init__.py b/addons/mrp_repair/__init__.py
index b0615653392..11529f98733 100644
--- a/addons/mrp_repair/__init__.py
+++ b/addons/mrp_repair/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import mrp_repair
+import models
 import wizard
diff --git a/addons/mrp_repair/__openerp__.py b/addons/mrp_repair/__openerp__.py
index 40fe0925d4c..e47f57ed90e 100644
--- a/addons/mrp_repair/__openerp__.py
+++ b/addons/mrp_repair/__openerp__.py
@@ -26,16 +26,15 @@ The following topics are covered by this module:
     'data': [
         'security/ir.model.access.csv',
         'security/mrp_repair_security.xml',
-        'mrp_repair_sequence.xml',
-        'wizard/mrp_repair_cancel_view.xml',
-        'wizard/mrp_repair_make_invoice_view.xml',
-        'mrp_repair_view.xml',
-        'mrp_repair_workflow.xml',
-        'mrp_repair_report.xml',
-
-        'views/report_mrprepairorder.xml',
+        'data/ir_sequence_data.xml',
+        'wizard/mrp_repair_cancel_views.xml',
+        'wizard/mrp_repair_make_invoice_views.xml',
+        'views/mrp_repair_views.xml',
+        'data/mrp_repair_data_workflow.xml',
+        'report/mrp_repair_reports.xml',
+        'report/mrp_repair_templates_repair_order.xml',
     ],
-    'demo': ['mrp_repair_demo.yml'],
+    'demo': ['data/mrp_repair_demo.yml'],
     'test': ['../account/test/account_minimal_test.xml',
              'test/mrp_repair_users.yml',
              'test/test_mrp_repair_noneinv.yml',
diff --git a/addons/mrp_repair/mrp_repair_sequence.xml b/addons/mrp_repair/data/ir_sequence_data.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_sequence.xml
rename to addons/mrp_repair/data/ir_sequence_data.xml
diff --git a/addons/mrp_repair/mrp_repair_workflow.xml b/addons/mrp_repair/data/mrp_repair_data_workflow.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_workflow.xml
rename to addons/mrp_repair/data/mrp_repair_data_workflow.xml
diff --git a/addons/mrp_repair/mrp_repair_demo.yml b/addons/mrp_repair/data/mrp_repair_demo.yml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_demo.yml
rename to addons/mrp_repair/data/mrp_repair_demo.yml
diff --git a/addons/mrp_repair/models/__init__.py b/addons/mrp_repair/models/__init__.py
new file mode 100644
index 00000000000..6aeed4868c4
--- /dev/null
+++ b/addons/mrp_repair/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import mrp_repair
diff --git a/addons/mrp_repair/mrp_repair.py b/addons/mrp_repair/models/mrp_repair.py
similarity index 100%
rename from addons/mrp_repair/mrp_repair.py
rename to addons/mrp_repair/models/mrp_repair.py
diff --git a/addons/mrp_repair/mrp_repair_report.xml b/addons/mrp_repair/report/mrp_repair_reports.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_report.xml
rename to addons/mrp_repair/report/mrp_repair_reports.xml
diff --git a/addons/mrp_repair/views/report_mrprepairorder.xml b/addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
similarity index 100%
rename from addons/mrp_repair/views/report_mrprepairorder.xml
rename to addons/mrp_repair/report/mrp_repair_templates_repair_order.xml
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/views/mrp_repair_views.xml
similarity index 100%
rename from addons/mrp_repair/mrp_repair_view.xml
rename to addons/mrp_repair/views/mrp_repair_views.xml
diff --git a/addons/mrp_repair/wizard/__init__.py b/addons/mrp_repair/wizard/__init__.py
index 725a50c35be..123bdb74bf5 100644
--- a/addons/mrp_repair/wizard/__init__.py
+++ b/addons/mrp_repair/wizard/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import cancel_repair
-import make_invoice
+import mrp_repair_cancel
+import mrp_repair_make_invoice
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/mrp_repair_cancel.py
similarity index 100%
rename from addons/mrp_repair/wizard/cancel_repair.py
rename to addons/mrp_repair/wizard/mrp_repair_cancel.py
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_views.xml
similarity index 100%
rename from addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
rename to addons/mrp_repair/wizard/mrp_repair_cancel_views.xml
diff --git a/addons/mrp_repair/wizard/make_invoice.py b/addons/mrp_repair/wizard/mrp_repair_make_invoice.py
similarity index 100%
rename from addons/mrp_repair/wizard/make_invoice.py
rename to addons/mrp_repair/wizard/mrp_repair_make_invoice.py
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_views.xml
similarity index 100%
rename from addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
rename to addons/mrp_repair/wizard/mrp_repair_make_invoice_views.xml