diff --git a/product_search_supplier_code/README.rst b/product_search_supplier_code/README.rst
new file mode 100644
index 0000000..048611f
--- /dev/null
+++ b/product_search_supplier_code/README.rst
@@ -0,0 +1,24 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+    :alt: License
+
+
+Product search
+==============
+
+This module allows to search product by its suppliers'code'.
+It also allow to search stock picking by its suppliers'code'.
+
+
+Setting
+=======
+
+No setting required.
+
+
+Credits
+=======
+
+Contributors
+------------
+* Florian da Costa <florian.dacosta@akretion.com>
+* Mourad EL HADJ MIMOUNE <mourad.elhadj.mimoune@akretion.com>
diff --git a/product_search_supplier_code/__openerp__.py b/product_search_supplier_code/__openerp__.py
index b444f0f..fffc3be 100644
--- a/product_search_supplier_code/__openerp__.py
+++ b/product_search_supplier_code/__openerp__.py
@@ -1,25 +1,7 @@
-# -*- encoding: utf-8 -*-
-##############################################################################
-#
-#    Stock Display Sale ID module for OpenERP
-#    Copyright (C) 2015 Akretion (http://www.akretion.com)
-#    @author Florian da Costa <florian.dacosta@akretion.com>
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
+# -*- coding: utf-8 -*-
+# © 2013-TODAY Akretion (http://www.akretion.com)
+#   @author Florian da Costa <florian.dacosta@akretion.com>
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 {
     'name': 'Product Search Supplier Code',
@@ -31,8 +13,8 @@
     'website': 'http://www.akretion.com',
     'depends': ['product', 'stock'],
     'data': [
-        'product_view.xml',
-        'picking_view.xml',
+        'views/product_view.xml',
+        'views/picking_view.xml',
     ],
     'installable': True,
     'active': False,
diff --git a/product_search_supplier_code/i18n/fr (1).po b/product_search_supplier_code/i18n/fr (1).po
deleted file mode 100644
index 8ef6e04..0000000
--- a/product_search_supplier_code/i18n/fr (1).po	
+++ /dev/null
@@ -1,21 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-10-30 12:56+0000\n"
-"PO-Revision-Date: 2015-10-30 12:56+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: product_search_supplier_code
-#: view:product.product:0
-msgid "Supplier Default Code"
-msgstr "Référence Fournisseur"
-
diff --git a/product_search_supplier_code/picking_view.xml b/product_search_supplier_code/views/picking_view.xml
similarity index 66%
rename from product_search_supplier_code/picking_view.xml
rename to product_search_supplier_code/views/picking_view.xml
index bd85463..72bb4ed 100644
--- a/product_search_supplier_code/picking_view.xml
+++ b/product_search_supplier_code/views/picking_view.xml
@@ -2,9 +2,9 @@
 <openerp>
   <data>
 
-<record id="picking_in_supplier_code_search" model="ir.ui.view">
-    <field name="model">stock.picking.in</field>
-    <field name="inherit_id" ref="stock.view_picking_in_search"/>
+<record id="stock_picking_supplier_code_search" model="ir.ui.view">
+    <field name="model">stock.picking</field>
+    <field name="inherit_id" ref="stock.view_picking_internal_search"/>
     <field name="arch" type="xml">
         <field name="product_id" position="after">
             <field name="move_lines" string="Supplier Default Code"
diff --git a/product_search_supplier_code/product_view.xml b/product_search_supplier_code/views/product_view.xml
similarity index 100%
rename from product_search_supplier_code/product_view.xml
rename to product_search_supplier_code/views/product_view.xml