diff --git a/addons/resource/__init__.py b/addons/resource/__init__.py
index 4ca401409b4..81fc81d29c9 100644
--- a/addons/resource/__init__.py
+++ b/addons/resource/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import resource
+import models
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index 9ca5c246d5f..836b0d216e0 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -18,9 +18,9 @@ associated to every resource. It also manages the leaves of every resource.
     'data': [
         'security/ir.model.access.csv',
         'security/resource_security.xml',
-        'resource_view.xml',
+        'views/resource_views.xml',
     ],
-    'demo': ['resource_demo.xml'],
+    'demo': ['data/resource_demo.xml'],
     'test': [
         'test/resource.yml',
         'test/duplicate_resource.yml',
diff --git a/addons/resource/resource_demo.xml b/addons/resource/data/resource_demo.xml
similarity index 100%
rename from addons/resource/resource_demo.xml
rename to addons/resource/data/resource_demo.xml
diff --git a/addons/resource/models/__init__.py b/addons/resource/models/__init__.py
new file mode 100644
index 00000000000..4ca401409b4
--- /dev/null
+++ b/addons/resource/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import resource
diff --git a/addons/resource/resource.py b/addons/resource/models/resource.py
similarity index 100%
rename from addons/resource/resource.py
rename to addons/resource/models/resource.py
diff --git a/addons/resource/resource_view.xml b/addons/resource/views/resource_views.xml
similarity index 100%
rename from addons/resource/resource_view.xml
rename to addons/resource/views/resource_views.xml