diff --git a/purchase_stock_usability/__init__.py b/purchase_stock_usability/__init__.py
index 370f577..0650744 100644
--- a/purchase_stock_usability/__init__.py
+++ b/purchase_stock_usability/__init__.py
@@ -1 +1 @@
-from . import purchase
+from . import models
diff --git a/purchase_stock_usability/__manifest__.py b/purchase_stock_usability/__manifest__.py
index 8c03f62..066d0f0 100644
--- a/purchase_stock_usability/__manifest__.py
+++ b/purchase_stock_usability/__manifest__.py
@@ -1,10 +1,10 @@
-# Copyright (C) 2014-2019 Akretion (http://www.akretion.com)
+# Copyright (C) 2014-2021 Akretion (http://www.akretion.com)
 # @author Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
 {
     'name': 'Purchase Stock Usability',
-    'version': '12.0.1.0.0',
+    'version': '14.0.1.0.0',
     'category': 'Purchases',
     'license': 'AGPL-3',
     'summary': 'Usability improvements on purchase_stock module',
@@ -23,7 +23,7 @@ Please contact Alexis de Lattre from Akretion <alexis.delattre@akretion.com> for
         'purchase_usability',
         ],
     'data': [
-        'stock_view.xml',
+        'views/stock_picking.xml',
         ],
-    'installable': False,
+    'installable': True,
 }
diff --git a/purchase_stock_usability/purchase.py b/purchase_stock_usability/models/purchase.py
similarity index 76%
rename from purchase_stock_usability/purchase.py
rename to purchase_stock_usability/models/purchase.py
index c2a8b3b..655fa95 100644
--- a/purchase_stock_usability/purchase.py
+++ b/purchase_stock_usability/models/purchase.py
@@ -1,16 +1,15 @@
-# -*- coding: utf-8 -*-
-# Copyright 2015-2019 Akretion France (http://www.akretion.com)
+# Copyright 2015-2021 Akretion France (http://www.akretion.com)
 # @author Alexis de Lattre <alexis.delattre@akretion.com>
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 
-from odoo import models, fields, api
+from odoo import api, fields, models
 
 
 class PurchaseOrder(models.Model):
     _inherit = 'purchase.order'
 
-    picking_type_id = fields.Many2one(track_visibility='onchange')
-    incoterm_id = fields.Many2one(track_visibility='onchange')
+    picking_type_id = fields.Many2one(tracking=True)
+    incoterm_id = fields.Many2one(tracking=True)
 
     # inherit compute method of the field delivery_partner_id
     # defined in purchase_usability
diff --git a/purchase_stock_usability/stock_view.xml b/purchase_stock_usability/views/stock_picking.xml
similarity index 81%
rename from purchase_stock_usability/stock_view.xml
rename to purchase_stock_usability/views/stock_picking.xml
index 8e8d395..22dbc76 100644
--- a/purchase_stock_usability/stock_view.xml
+++ b/purchase_stock_usability/views/stock_picking.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2017-2019 Akretion (http://www.akretion.com/)
+  Copyright 2017-2021 Akretion (http://www.akretion.com/)
   @author: Alexis de Lattre <alexis.delattre@akretion.com>
   License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
 -->
 
 <odoo>
 
+
 <record id="view_picking_form" model="ir.ui.view">
-    <field name="name">purchase_usability.stock.picking.form</field>
+    <field name="name">purchase_stock_usability.stock.picking.form</field>
     <field name="model">stock.picking</field>
     <field name="inherit_id" ref="stock.view_picking_form"/>
     <field name="arch" type="xml">