diff --git a/addons/document/__openerp__.py b/addons/document/__openerp__.py
index ac227827d11..1a8a6e32e48 100644
--- a/addons/document/__openerp__.py
+++ b/addons/document/__openerp__.py
@@ -36,16 +36,17 @@
 """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['base', 'process'],
+    'depends': ['base', 'process','board'],
     'init_xml': [],
     'update_xml': [
         'document_view.xml',
         'document_data.xml',
         'security/document_security.xml',
         'security/ir.model.access.csv',
-        'report/document_report_view.xml'
+        'report/document_report_view.xml',
+        'board_document_view.xml',
     ],
-    'demo_xml': [ 'document_demo.xml',],
+    'demo_xml': [ 'document_demo.xml','board_document_demo.xml'],
     'test': [
         'test/document_test.yml',
     ],
diff --git a/addons/board_document/board_document_demo.xml b/addons/document/board_document_demo.xml
similarity index 100%
rename from addons/board_document/board_document_demo.xml
rename to addons/document/board_document_demo.xml
diff --git a/addons/board_document/board_document_view.xml b/addons/document/board_document_view.xml
similarity index 100%
rename from addons/board_document/board_document_view.xml
rename to addons/document/board_document_view.xml
diff --git a/addons/purchase/__openerp__.py b/addons/purchase/__openerp__.py
index 46d7c3296b9..21019ff0bd5 100644
--- a/addons/purchase/__openerp__.py
+++ b/addons/purchase/__openerp__.py
@@ -50,6 +50,7 @@
         'partner_view.xml',
         'process/purchase_process.xml',
         'report/purchase_report_view.xml',
+        'board_purchase_view.xml',
     ],
     'test': [
              'test/purchase_from_order.yml',
diff --git a/addons/board_purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml
similarity index 100%
rename from addons/board_purchase/board_purchase_view.xml
rename to addons/purchase/board_purchase_view.xml
diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 651945752a7..3815d5e009f 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -42,7 +42,7 @@
     """,
     'author': 'Tiny',
     'website': 'http://www.openerp.com',
-    'depends': ['product', 'stock', 'mrp_procurement', 'process'],
+    'depends': ['product', 'stock', 'mrp_procurement', 'process','board'],
     'init_xml': [],
     'update_xml': [
         'wizard/sale_make_invoice_advance.xml',
@@ -58,9 +58,10 @@
         'report/sale_report_view.xml',
         'sale_report.xml',
         'stock_view.xml',
+        'board_sale_view.xml',
 #        'process/sale_process.xml',
     ],
-    'demo_xml': ['sale_demo.xml'],
+    'demo_xml': ['sale_demo.xml','board_sale_demo.xml'],
     'test': [
              'test/shipping_manual_sale_order.yml',
              'test/prepaid_sale_order.yml',
diff --git a/addons/board_sale/board_sale_demo.xml b/addons/sale/board_sale_demo.xml
similarity index 100%
rename from addons/board_sale/board_sale_demo.xml
rename to addons/sale/board_sale_demo.xml
diff --git a/addons/board_sale/board_sale_view.xml b/addons/sale/board_sale_view.xml
similarity index 100%
rename from addons/board_sale/board_sale_view.xml
rename to addons/sale/board_sale_view.xml