diff --git a/addons/note/__init__.py b/addons/note/__init__.py
index 8afd58169b8..81fc81d29c9 100644
--- a/addons/note/__init__.py
+++ b/addons/note/__init__.py
@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import note
+import models
diff --git a/addons/note/__openerp__.py b/addons/note/__openerp__.py
index 4c91cf6667d..5769d4353b5 100644
--- a/addons/note/__openerp__.py
+++ b/addons/note/__openerp__.py
@@ -24,14 +24,14 @@ Notes can be found in the 'Home' menu.
         'mail',
     ],
     'data': [
-        'security/ir.rule.xml',
+        'security/note_security.xml',
         'security/ir.model.access.csv',
-        'note_data.xml',
-        'note_view.xml',
-        'views/note.xml',
+        'data/note_data.xml',
+        'views/note_views.xml',
+        'views/note_templates.xml',
     ],
     'demo': [
-        'note_demo.xml',
+        'data/note_demo.xml',
     ],
     'test': [
     ],
diff --git a/addons/note/note_data.xml b/addons/note/data/note_data.xml
similarity index 100%
rename from addons/note/note_data.xml
rename to addons/note/data/note_data.xml
diff --git a/addons/note/note_demo.xml b/addons/note/data/note_demo.xml
similarity index 100%
rename from addons/note/note_demo.xml
rename to addons/note/data/note_demo.xml
diff --git a/addons/note/models/__init__.py b/addons/note/models/__init__.py
new file mode 100644
index 00000000000..8afd58169b8
--- /dev/null
+++ b/addons/note/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import note
diff --git a/addons/note/note.py b/addons/note/models/note.py
similarity index 100%
rename from addons/note/note.py
rename to addons/note/models/note.py
diff --git a/addons/note/security/ir.rule.xml b/addons/note/security/note_security.xml
similarity index 100%
rename from addons/note/security/ir.rule.xml
rename to addons/note/security/note_security.xml
diff --git a/addons/note/views/note.xml b/addons/note/views/note_templates.xml
similarity index 100%
rename from addons/note/views/note.xml
rename to addons/note/views/note_templates.xml
diff --git a/addons/note/note_view.xml b/addons/note/views/note_views.xml
similarity index 100%
rename from addons/note/note_view.xml
rename to addons/note/views/note_views.xml