diff --git a/addons/note_pad/__openerp__.py b/addons/note_pad/__openerp__.py
index 039ae7a37fe..091a48f13e4 100644
--- a/addons/note_pad/__openerp__.py
+++ b/addons/note_pad/__openerp__.py
@@ -20,7 +20,7 @@ Use for update your text memo in real time with the following user that you invi
         'note',
     ],
     'data': [
-        'note_pad_view.xml',
+        'views/note_view.xml',
     ],
     'installable': True,
     'application': False,
diff --git a/addons/note_pad/models/__init__.py b/addons/note_pad/models/__init__.py
new file mode 100644
index 00000000000..8afd58169b8
--- /dev/null
+++ b/addons/note_pad/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_pad/note_pad.py b/addons/note_pad/models/note.py
similarity index 100%
rename from addons/note_pad/note_pad.py
rename to addons/note_pad/models/note.py
diff --git a/addons/note_pad/note_pad_view.xml b/addons/note_pad/views/note_views.xml
similarity index 100%
rename from addons/note_pad/note_pad_view.xml
rename to addons/note_pad/views/note_views.xml