diff --git a/addons/board/__init__.py b/addons/board/__init__.py
index 4e9c6c03a04..ac0011716f6 100644
--- a/addons/board/__init__.py
+++ b/addons/board/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-import board
 import controllers
+import models
diff --git a/addons/board/__openerp__.py b/addons/board/__openerp__.py
index f76facee8c5..605840c2309 100644
--- a/addons/board/__openerp__.py
+++ b/addons/board/__openerp__.py
@@ -15,8 +15,8 @@ Allows users to create custom dashboard.
     'depends': ['base', 'web'],
     'data': [
         'security/ir.model.access.csv',
-        'board_mydashboard_view.xml',
-        'views/board.xml',
+        'views/board_views.xml',
+        'views/board_templates.xml',
     ],
     'qweb': ['static/src/xml/*.xml'],
     'installable': True,
diff --git a/addons/board/controllers/__init__.py b/addons/board/controllers/__init__.py
new file mode 100644
index 00000000000..f48716d3a69
--- /dev/null
+++ b/addons/board/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import main
diff --git a/addons/board/controllers.py b/addons/board/controllers/main.py
similarity index 100%
rename from addons/board/controllers.py
rename to addons/board/controllers/main.py
diff --git a/addons/board/models/__init__.py b/addons/board/models/__init__.py
new file mode 100644
index 00000000000..71d04d4fcb8
--- /dev/null
+++ b/addons/board/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import board
diff --git a/addons/board/board.py b/addons/board/models/board.py
similarity index 100%
rename from addons/board/board.py
rename to addons/board/models/board.py
diff --git a/addons/board/views/board.xml b/addons/board/views/board_templates.xml
similarity index 100%
rename from addons/board/views/board.xml
rename to addons/board/views/board_templates.xml
diff --git a/addons/board/board_mydashboard_view.xml b/addons/board/views/board_views.xml
similarity index 100%
rename from addons/board/board_mydashboard_view.xml
rename to addons/board/views/board_views.xml