diff --git a/addons/membership/__init__.py b/addons/membership/__init__.py
index 41a9305533f..8f7bf4b27dd 100644
--- a/addons/membership/__init__.py
+++ b/addons/membership/__init__.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import membership
+import models
 import wizard
 import report
diff --git a/addons/membership/__openerp__.py b/addons/membership/__openerp__.py
index c2774385682..13a91188f74 100644
--- a/addons/membership/__openerp__.py
+++ b/addons/membership/__openerp__.py
@@ -23,13 +23,13 @@ invoice and send propositions for membership renewal.
     'depends': ['base', 'product', 'account'],
     'data': [
         'security/ir.model.access.csv',
-        'wizard/membership_invoice_view.xml',
-        'membership_data.xml',
-        'membership_view.xml',
-        'report/report_membership_view.xml',
+        'wizard/membership_invoice_views.xml',
+        'data/membership_data.xml',
+        'views/membership_views.xml',
+        'report/report_membership_views.xml',
     ],
     'demo': [
-        'membership_demo.xml',
+        'data/membership_demo.xml',
     ],
     'website': 'https://www.odoo.com/page/community-builder',
     'test': [
diff --git a/addons/membership/membership_data.xml b/addons/membership/data/membership_data.xml
similarity index 100%
rename from addons/membership/membership_data.xml
rename to addons/membership/data/membership_data.xml
diff --git a/addons/membership/membership_demo.xml b/addons/membership/data/membership_demo.xml
similarity index 100%
rename from addons/membership/membership_demo.xml
rename to addons/membership/data/membership_demo.xml
diff --git a/addons/membership/models/__init__.py b/addons/membership/models/__init__.py
new file mode 100644
index 00000000000..08753437083
--- /dev/null
+++ b/addons/membership/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import membership
diff --git a/addons/membership/membership.py b/addons/membership/models/membership.py
similarity index 100%
rename from addons/membership/membership.py
rename to addons/membership/models/membership.py
diff --git a/addons/membership/report/report_membership_view.xml b/addons/membership/report/report_membership_views.xml
similarity index 100%
rename from addons/membership/report/report_membership_view.xml
rename to addons/membership/report/report_membership_views.xml
diff --git a/addons/membership/membership_view.xml b/addons/membership/views/membership_views.xml
similarity index 100%
rename from addons/membership/membership_view.xml
rename to addons/membership/views/membership_views.xml
diff --git a/addons/membership/wizard/membership_invoice_view.xml b/addons/membership/wizard/membership_invoice_views.xml
similarity index 100%
rename from addons/membership/wizard/membership_invoice_view.xml
rename to addons/membership/wizard/membership_invoice_views.xml