diff --git a/addons/mrp/__openerp__.py b/addons/mrp/__openerp__.py
index 97e23f3488d..980841a4429 100644
--- a/addons/mrp/__openerp__.py
+++ b/addons/mrp/__openerp__.py
@@ -75,8 +75,11 @@
         'mrp_installer.xml',
         'report/mrp_report_view.xml',
         'report/mrp_production_order_view.xml',
+        'board_manufacturing_view.xml',
+
+        
     ],
-    'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml'],
+    'demo_xml': ['mrp_demo.xml', 'mrp_order_point.xml','board_manufacturing_demo.xml'],
     'test': [
              'test/mrp_phantom_bom.yml',
              'test/mrp_production_order.yml',
diff --git a/addons/board_manufacturing/board_manufacturing_demo.xml b/addons/mrp/board_manufacturing_demo.xml
similarity index 100%
rename from addons/board_manufacturing/board_manufacturing_demo.xml
rename to addons/mrp/board_manufacturing_demo.xml
diff --git a/addons/board_manufacturing/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml
similarity index 100%
rename from addons/board_manufacturing/board_manufacturing_view.xml
rename to addons/mrp/board_manufacturing_view.xml
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index ec7ce1c6cee..15536a5e906 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -67,6 +67,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
         "report/report_stock_picking_view.xml",
         "security/stock_security.xml",
         "security/ir.model.access.csv",
+        "board_warehouse_view.xml"
     ],
     'test': ['test/stock_test.yml'],
     'installable': True,
diff --git a/addons/board_warehouse/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml
similarity index 100%
rename from addons/board_warehouse/board_warehouse_view.xml
rename to addons/stock/board_warehouse_view.xml