diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 54f573fd9c6..67a75e6eb34 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -36,44 +36,50 @@ Dashboard / Reports for Inventory Management will include:
     'category': 'Inventory Management',
     'sequence': 13,
     'demo': [
-        'stock_demo_pre.yml',
-        'stock_demo.xml',
-        'procurement_demo.xml',
-        'stock_orderpoint.xml',
-        'stock_orderpoint.yml',
-        'stock_demo.yml',
-        'stock_location_demo_cpu1.xml',
-        'stock_location_demo_cpu3.yml',
+        'data/stock_demo_pre.yml',
+        'data/stock_demo.xml',
+        'data/procurement_demo.xml',
+        'data/stock_orderpoint_demo.xml',
+        'data/stock_orderpoint_demo.yml',
+        'data/stock_demo.yml',
+        'data/stock_location_demo_cpu1.xml',
+        'data/stock_location_demo_cpu3.yml',
     ],
     'data': [
-        'data/default_barcode_patterns.xml',
         'security/stock_security.xml',
         'security/ir.model.access.csv',
-        'stock_data.xml',
-        'stock_data.yml',
+
+        'views/stock_menu_views.xml',
+
+        'report/report_stock_forecast.xml',
+        'report/stock_report_views.xml',
+        'report/report_stock_view.xml',
+        'report/report_package_barcode.xml',
+        'report/report_lot_barcode.xml',
+        'report/report_location_barcode.xml',
+        'report/report_stockpicking_operations.xml',
+        'report/report_deliveryslip.xml',
+        'report/report_stockinventory.xml',
+
         'wizard/stock_move_view.xml',
         'wizard/stock_change_product_qty_view.xml',
         'wizard/stock_return_picking_view.xml',
         'wizard/make_procurement_view.xml',
         'wizard/orderpoint_procurement_view.xml',
-        'report/report_stock_forecast.xml',
-        'stock_incoterms.xml',
-        'stock_report.xml',
-        'stock_view.xml',
-        'stock_sequence.xml',
-        'product_view.xml',
-        'partner_view.xml',
-        'report/report_stock_view.xml',
-        'res_config_view.xml',
-        'views/report_package_barcode.xml',
-        'views/report_lot_barcode.xml',
-        'views/report_location_barcode.xml',
-        'views/report_stockpicking_operations.xml',
-        'views/report_deliveryslip.xml',
-        'views/report_stockinventory.xml',
-        'stock_dashboard.xml',
         'wizard/stock_immediate_transfer.xml',
         'wizard/stock_backorder_confirmation.xml',
+
+        'stock_view.xml',
+        'product_view.xml',
+        'partner_view.xml',
+        'res_config_view.xml',
+        'stock_dashboard.xml',
+
+        'data/default_barcode_patterns.xml',
+        'data/stock_data.xml',
+        'data/stock_data.yml',
+        'data/stock_incoterms_data.xml',
+        'data/stock_sequence_data.xml',
         'data/web_planner_data.xml',
     ],
     'test': [
diff --git a/addons/stock/procurement_demo.xml b/addons/stock/data/procurement_demo.xml
similarity index 100%
rename from addons/stock/procurement_demo.xml
rename to addons/stock/data/procurement_demo.xml
diff --git a/addons/stock/stock_data.xml b/addons/stock/data/stock_data.xml
similarity index 100%
rename from addons/stock/stock_data.xml
rename to addons/stock/data/stock_data.xml
diff --git a/addons/stock/stock_data.yml b/addons/stock/data/stock_data.yml
similarity index 100%
rename from addons/stock/stock_data.yml
rename to addons/stock/data/stock_data.yml
diff --git a/addons/stock/stock_demo.xml b/addons/stock/data/stock_demo.xml
similarity index 100%
rename from addons/stock/stock_demo.xml
rename to addons/stock/data/stock_demo.xml
diff --git a/addons/stock/stock_demo.yml b/addons/stock/data/stock_demo.yml
similarity index 100%
rename from addons/stock/stock_demo.yml
rename to addons/stock/data/stock_demo.yml
diff --git a/addons/stock/stock_demo_pre.yml b/addons/stock/data/stock_demo_pre.yml
similarity index 100%
rename from addons/stock/stock_demo_pre.yml
rename to addons/stock/data/stock_demo_pre.yml
diff --git a/addons/stock/stock_incoterms.xml b/addons/stock/data/stock_incoterms_data.xml
similarity index 100%
rename from addons/stock/stock_incoterms.xml
rename to addons/stock/data/stock_incoterms_data.xml
diff --git a/addons/stock/stock_location_demo_cpu1.xml b/addons/stock/data/stock_location_demo_cpu1.xml
similarity index 100%
rename from addons/stock/stock_location_demo_cpu1.xml
rename to addons/stock/data/stock_location_demo_cpu1.xml
diff --git a/addons/stock/stock_location_demo_cpu3.yml b/addons/stock/data/stock_location_demo_cpu3.yml
similarity index 100%
rename from addons/stock/stock_location_demo_cpu3.yml
rename to addons/stock/data/stock_location_demo_cpu3.yml
diff --git a/addons/stock/stock_orderpoint.xml b/addons/stock/data/stock_orderpoint_demo.xml
similarity index 100%
rename from addons/stock/stock_orderpoint.xml
rename to addons/stock/data/stock_orderpoint_demo.xml
diff --git a/addons/stock/stock_orderpoint.yml b/addons/stock/data/stock_orderpoint_demo.yml
similarity index 100%
rename from addons/stock/stock_orderpoint.yml
rename to addons/stock/data/stock_orderpoint_demo.yml
diff --git a/addons/stock/stock_sequence.xml b/addons/stock/data/stock_sequence_data.xml
similarity index 100%
rename from addons/stock/stock_sequence.xml
rename to addons/stock/data/stock_sequence_data.xml
diff --git a/addons/stock/views/report_deliveryslip.xml b/addons/stock/report/report_deliveryslip.xml
similarity index 100%
rename from addons/stock/views/report_deliveryslip.xml
rename to addons/stock/report/report_deliveryslip.xml
diff --git a/addons/stock/views/report_location_barcode.xml b/addons/stock/report/report_location_barcode.xml
similarity index 100%
rename from addons/stock/views/report_location_barcode.xml
rename to addons/stock/report/report_location_barcode.xml
diff --git a/addons/stock/views/report_lot_barcode.xml b/addons/stock/report/report_lot_barcode.xml
similarity index 100%
rename from addons/stock/views/report_lot_barcode.xml
rename to addons/stock/report/report_lot_barcode.xml
diff --git a/addons/stock/views/report_package_barcode.xml b/addons/stock/report/report_package_barcode.xml
similarity index 100%
rename from addons/stock/views/report_package_barcode.xml
rename to addons/stock/report/report_package_barcode.xml
diff --git a/addons/stock/views/report_stockinventory.xml b/addons/stock/report/report_stockinventory.xml
similarity index 100%
rename from addons/stock/views/report_stockinventory.xml
rename to addons/stock/report/report_stockinventory.xml
diff --git a/addons/stock/views/report_stockpicking_operations.xml b/addons/stock/report/report_stockpicking_operations.xml
similarity index 100%
rename from addons/stock/views/report_stockpicking_operations.xml
rename to addons/stock/report/report_stockpicking_operations.xml
diff --git a/addons/stock/stock_report.xml b/addons/stock/report/stock_report_views.xml
similarity index 100%
rename from addons/stock/stock_report.xml
rename to addons/stock/report/stock_report_views.xml
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 1976dba4dbd..d5db9efa796 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -1,62 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-
-        <!-- Top menu item -->
-        <menuitem name="Inventory"
-            id="menu_stock_root"
-            groups="group_stock_manager,group_stock_user"
-            icon="fa-archive"
-            web_icon="stock,static/description/icon.png"
-            sequence="30"/>
-
-        <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="2" groups="base.group_no_one"/>
-        <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
-            sequence="100" groups="group_stock_manager"/>
-        <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" groups="stock.group_stock_manager" sequence="1"/>
-        <menuitem id="menu_routes_config" name="Routes" parent="menu_stock_config_settings" sequence="2" groups="stock.group_adv_location"/>
-        <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="3" groups="product.group_stock_packaging"/>
-        <menuitem
-            id="menu_product_in_config_stock" name="Products"
-            parent="stock.menu_stock_config_settings" sequence="4"/>
-        <menuitem
-            action="product.product_uom_form_action" id="menu_stock_uom_form_action"
-            parent="menu_stock_config_settings" sequence="35" groups="product.group_uom"/>
-
-
-        <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
-
-        <record id="product_template_action_product" model="ir.actions.act_window">
-            <field name="name">Products</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">product.template</field>
-            <field name="view_mode">kanban,tree,form</field>
-            <field name="view_type">form</field>
-            <field name="context">{"search_default_products": 1, 'default_type': 'product'}</field>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    Click to define a new product.
-                </p>
-            </field>
-        </record>
-
-        <menuitem
-            action="product_template_action_product" id="menu_product_variant_config_stock" name="Products"
-            parent="stock.menu_stock_inventory_control" sequence="1"/>
-
-        <menuitem id="product_product_menu" name="Product Variants" action="product.product_normal_action"
-            parent="menu_stock_inventory_control" sequence="2" groups="product.group_product_variant"/>
-
-        <menuitem
-            action="product.product_category_action_form" id="menu_product_category_config_stock"
-            parent="stock.menu_product_in_config_stock" sequence="2"/>
-        <menuitem
-            action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
-            parent="menu_product_in_config_stock" sequence="5" groups="product.group_uom"/>
-        <menuitem
-            id="menu_stock_unit_measure_stock" name="Units of Measure"
-            parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
-
         <record id="stock_inventory_line_tree" model="ir.ui.view">
             <field name="name">stock.inventory.line.tree</field>
             <field name="model">stock.inventory.line</field>
@@ -2192,7 +2136,6 @@
         <menuitem action="action_procurement_compute" id="menu_procurement_compute" parent="menu_stock_sched" sequence="2"/>
         <menuitem action="procurement.action_compute_schedulers" id="menu_stock_proc_schedulers" parent="menu_stock_sched" sequence="1" groups="stock.group_stock_manager"/>
         <menuitem id="menu_stock_procurement" name="Automatic Procurements" parent="stock.menu_stock_config_settings" sequence="5"/>
-        <menuitem id="stock.menu_warehouse_report" name="Reports" sequence="99" parent="stock.menu_stock_root" groups="group_stock_manager"/>
         <menuitem action="procurement.procurement_order_action_exceptions" id="menu_stock_procurement_action" parent="stock.menu_warehouse_report" sequence="150" groups="stock.group_stock_manager"/>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="stock.menu_warehouse_report" sequence="130"/>
         <menuitem id="menu_quants" name="Inventory Valuation" parent="stock.menu_warehouse_report" sequence="120" action="quantsact"/>
@@ -2436,10 +2379,5 @@
                 </div>
             </field>
         </record>
-
-        <!-- Barcode Nomenclatures -->
-        <menuitem parent="menu_stock_config_settings" action="barcodes.action_barcode_nomenclature_form" id="menu_wms_barcode_nomenclature_all"
-            sequence="50" groups="base.group_no_one"/>
-
     </data>
 </openerp>
diff --git a/addons/stock/views/stock_menu_views.xml b/addons/stock/views/stock_menu_views.xml
new file mode 100644
index 00000000000..623fdbc1fc6
--- /dev/null
+++ b/addons/stock/views/stock_menu_views.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <menuitem name="Inventory" id="menu_stock_root" sequence="30"
+        groups="group_stock_manager,group_stock_user"
+        icon="fa-archive" web_icon="stock,static/description/icon.png"/>
+
+    <menuitem id="menu_stock_warehouse_mgmt" name="Operations" parent="menu_stock_root" sequence="2" groups="base.group_no_one"/>
+
+    <menuitem id="menu_stock_config_settings" name="Configuration" parent="menu_stock_root"
+        sequence="100" groups="group_stock_manager"/>
+    <menuitem id="menu_warehouse_config" name="Warehouse Management" parent="menu_stock_config_settings" groups="stock.group_stock_manager" sequence="1"/>
+    <menuitem id="menu_routes_config" name="Routes" parent="menu_stock_config_settings" sequence="2" groups="stock.group_adv_location"/>
+    <menuitem id="menu_packages_config" name="Packages" parent="menu_stock_config_settings" sequence="3" groups="product.group_stock_packaging"/>
+    <menuitem id="menu_wms_barcode_nomenclature_all" parent="menu_stock_config_settings" action="barcodes.action_barcode_nomenclature_form" 
+        sequence="50" groups="base.group_no_one"/>
+    <menuitem id="menu_product_in_config_stock" name="Products" parent="stock.menu_stock_config_settings" sequence="4"/>
+    <menuitem
+        action="product.product_category_action_form" id="menu_product_category_config_stock"
+        parent="stock.menu_product_in_config_stock" sequence="2"/>
+    <menuitem
+        action="product.product_uom_categ_form_action" id="menu_stock_uom_categ_form_action"
+        parent="menu_product_in_config_stock" sequence="5" groups="product.group_uom"/>
+    <menuitem
+        id="menu_stock_unit_measure_stock" name="Units of Measure"
+        parent="stock.menu_product_in_config_stock"  sequence="35" groups="product.group_uom"/>
+    <menuitem id="menu_stock_uom_form_action" action="product.product_uom_form_action" 
+        parent="menu_stock_config_settings" sequence="35" groups="product.group_uom"/>
+
+    <menuitem id="menu_stock_inventory_control" name="Inventory Control" parent="menu_stock_root" sequence="4"/>
+    <record id="product_template_action_product" model="ir.actions.act_window">
+        <field name="name">Products</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">product.template</field>
+        <field name="view_mode">kanban,tree,form</field>
+        <field name="view_type">form</field>
+        <field name="context">{"search_default_products": 1, 'default_type': 'product'}</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Click to define a new product.
+            </p>
+        </field>
+    </record>
+    <menuitem id="menu_product_variant_config_stock" name="Products" action="product_template_action_product"
+        parent="stock.menu_stock_inventory_control" sequence="1"/>
+    <menuitem id="product_product_menu" name="Product Variants" action="product.product_normal_action"
+        parent="menu_stock_inventory_control" sequence="2" groups="product.group_product_variant"/>
+
+    <menuitem id="stock.menu_warehouse_report" name="Reports" sequence="99" parent="stock.menu_stock_root" groups="group_stock_manager"/>
+</odoo>
\ No newline at end of file