diff --git a/stock_picking_type_default_partner/__init__.py b/stock_picking_type_default_partner/__init__.py
index 838de2d..0650744 100644
--- a/stock_picking_type_default_partner/__init__.py
+++ b/stock_picking_type_default_partner/__init__.py
@@ -1,3 +1 @@
-# -*- encoding: utf-8 -*-
-
-from . import stock
+from . import models
diff --git a/stock_picking_type_default_partner/__manifest__.py b/stock_picking_type_default_partner/__manifest__.py
index bc6e7f8..6ee5c77 100644
--- a/stock_picking_type_default_partner/__manifest__.py
+++ b/stock_picking_type_default_partner/__manifest__.py
@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
-# Copyright (C) 2014-2018 Akretion (http://www.akretion.com)
+# Copyright 2014-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).
 
 
 {
     'name': 'Stock Picking Type Default Partner',
-    'version': '10.0.1.0.0',
+    'version': '14.0.1.0.0',
     'category': 'Inventory, Logistics, Warehousing',
     'license': 'AGPL-3',
     'summary': 'Adds a default partner on types of operation',
@@ -21,6 +20,6 @@ This module has been written by Alexis de Lattre from Akretion <alexis.delattre@
     'author': 'Akretion',
     'website': 'http://www.akretion.com',
     'depends': ['stock'],
-    'data': ['stock_view.xml'],
+    'data': ['views/stock_picking_type.xml'],
     'installable': True,
 }
diff --git a/stock_picking_type_default_partner/models/__init__.py b/stock_picking_type_default_partner/models/__init__.py
new file mode 100644
index 0000000..ae4c272
--- /dev/null
+++ b/stock_picking_type_default_partner/models/__init__.py
@@ -0,0 +1 @@
+from . import stock_picking
diff --git a/stock_picking_type_default_partner/stock.py b/stock_picking_type_default_partner/models/stock_picking.py
similarity index 84%
rename from stock_picking_type_default_partner/stock.py
rename to stock_picking_type_default_partner/models/stock_picking.py
index fcce416..2c58a46 100644
--- a/stock_picking_type_default_partner/stock.py
+++ b/stock_picking_type_default_partner/models/stock_picking.py
@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-# Copyright 2014-2018 Akretion (http://www.akretion.com)
+# Copyright 2014-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).
 
@@ -28,4 +27,5 @@ class StockPicking(models.Model):
                 return picktype.default_partner_id
         return False
 
-    partner_id = fields.Many2one(default=_default_partner_id)
+    partner_id = fields.Many2one(
+        default=lambda self: self._default_partner_id())
diff --git a/stock_picking_type_default_partner/stock_view.xml b/stock_picking_type_default_partner/views/stock_picking_type.xml
similarity index 90%
rename from stock_picking_type_default_partner/stock_view.xml
rename to stock_picking_type_default_partner/views/stock_picking_type.xml
index f58e139..7ecb6d1 100644
--- a/stock_picking_type_default_partner/stock_view.xml
+++ b/stock_picking_type_default_partner/views/stock_picking_type.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  Copyright (C) 2015-2018 Akretion (http://www.akretion.com/)
+  Copyright 2015-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).
 -->