diff --git a/web_widget_digital_signature/README.rst b/web_widget_digital_signature/README.rst
new file mode 100644
index 00000000..638c265a
--- /dev/null
+++ b/web_widget_digital_signature/README.rst
@@ -0,0 +1,57 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+=====================
+Web Digital Signature
+=====================
+
+This module provides the functionality to store digital signature image for a record.
+
+Usage
+=====
+
+To use this module, you need to add ``widget="signature"`` to your binary field in your view.
+
+See ``web_widget_digital_signature_user`` and ``web_widget_digital_signature_sale_order`` modules as examples.
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/162/8.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/web/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed `feedback
+<https://github.com/OCA/
+web/issues/new?body=module:%20
+web_widget_digital_signature%0Aversion:%20
+8.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Credits
+=======
+
+Contributors
+------------
+
+* Mohamed Magdy <moh.magdy40@gmail.com>
+* Jay Vora <jay.vora@serpentcs.com>
+* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/web_widget_digital_signature/__init__.py b/web_widget_digital_signature/__init__.py
index e14f6294..531086ac 100644
--- a/web_widget_digital_signature/__init__.py
+++ b/web_widget_digital_signature/__init__.py
@@ -3,7 +3,8 @@
 #    
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
-#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
+#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd.
+#    (<http://www.serpentcs.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
@@ -19,6 +20,3 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
-import users
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
diff --git a/web_widget_digital_signature/__openerp__.py b/web_widget_digital_signature/__openerp__.py
index 687ce325..ed44aac8 100644
--- a/web_widget_digital_signature/__openerp__.py
+++ b/web_widget_digital_signature/__openerp__.py
@@ -3,7 +3,8 @@
 #    
 #    OpenERP, Open Source Management Solution
 #    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
-#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
+#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd.
+#    (<http://www.serpentcs.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
@@ -22,23 +23,18 @@
 
 {
     "name" : "Web Digital Signature",
-    "version" : "1.0",
-    "author" : "Serpent Consulting Services Pvt. Ltd.",
-    "category": '',
+    "version" : "8.0.1.0.0",
+    "author" : "Serpent Consulting Services Pvt. Ltd., "
+               "Odoo Community Association (OCA)",
+    "category": 'web',
+    "license": "AGPL-3",
     'complexity': "easy",
     'depends': ['web'],
-    "description": """
-        This module provides the functionality to store digital signature image for a record.
-        The example can be seen into the User's form view where we have added a test field under signature.
-    """,
     'data': [
         'views/we_digital_sign_view.xml',
-        'users_view.xml'
     ],
     'website': 'http://www.serpentcs.com',
     'qweb': ['static/src/xml/digital_sign.xml'],
     'installable': True,
     'auto_install': False,
 }
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/web_widget_digital_signature/views/we_digital_sign_view.xml b/web_widget_digital_signature/views/we_digital_sign_view.xml
index 44f36448..cd5a0cb1 100644
--- a/web_widget_digital_signature/views/we_digital_sign_view.xml
+++ b/web_widget_digital_signature/views/we_digital_sign_view.xml
@@ -1,6 +1,6 @@
 <openerp>
     <data>
-        <template id="sale_order_backend" name="sale_order assets" inherit_id="web.assets_backend">
+        <template id="signature_backend" name="signature assets" inherit_id="web.assets_backend">
             <xpath expr="." position="inside">
                 <link rel="stylesheet" href="/web_widget_digital_signature/static/src/css/digital.css"/>
                 <link rel="stylesheet" href="/web_widget_digital_signature/static/src/css/jquery.signature.css"/>
diff --git a/web_widget_digital_signature_user/README.rst b/web_widget_digital_signature_user/README.rst
new file mode 100644
index 00000000..6221bfb5
--- /dev/null
+++ b/web_widget_digital_signature_user/README.rst
@@ -0,0 +1,58 @@
+.. image:: https://img.shields.io/badge/licence-AGPL--3-blue.svg
+   :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
+   :alt: License: AGPL-3
+
+===============================
+Web Digital Signature for users
+===============================
+
+This module adds a signature field (using ``web_widget_digital_signature``) to user form.
+
+Usage
+=====
+
+.. image:: https://odoo-community.org/website/image/ir.attachment/5784_f2813bd/datas
+   :alt: Try me on Runbot
+   :target: https://runbot.odoo-community.org/runbot/162/8.0
+
+Bug Tracker
+===========
+
+Bugs are tracked on `GitHub Issues
+<https://github.com/OCA/web/issues>`_. In case of trouble, please
+check there if your issue has already been reported. If you spotted it first,
+help us smashing it by providing a detailed and welcomed `feedback
+<https://github.com/OCA/
+web/issues/new?body=module:%20
+web_widget_digital_signature%0Aversion:%20
+8.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+
+Credits
+=======
+
+Images
+------
+
+* Odoo Community Association: `Icon <https://github.com/OCA/maintainer-tools/blob/master/template/module/static/description/icon.svg>`_.
+
+Contributors
+------------
+
+* Mohamed Magdy <moh.magdy40@gmail.com>
+* Jay Vora <jay.vora@serpentcs.com>
+* Lorenzo Battistini <lorenzo.battistini@agilebg.com>
+
+Maintainer
+----------
+
+.. image:: https://odoo-community.org/logo.png
+   :alt: Odoo Community Association
+   :target: https://odoo-community.org
+
+This module is maintained by the OCA.
+
+OCA, or the Odoo Community Association, is a nonprofit organization whose
+mission is to support the collaborative development of Odoo features and
+promote its widespread use.
+
+To contribute to this module, please visit https://odoo-community.org.
diff --git a/web_widget_digital_signature_user/__init__.py b/web_widget_digital_signature_user/__init__.py
new file mode 100644
index 00000000..57316573
--- /dev/null
+++ b/web_widget_digital_signature_user/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd.
+#    (<http://www.serpentcs.com>).
+#    Copyright 2015 Lorenzo Battistini - Agile Business Group
+#
+#    About License, see __openerp__.py
+#
+##############################################################################
+
+from . import models
diff --git a/web_widget_digital_signature/users.py b/web_widget_digital_signature_user/__openerp__.py
similarity index 62%
rename from web_widget_digital_signature/users.py
rename to web_widget_digital_signature_user/__openerp__.py
index 20486b62..be446d0d 100644
--- a/web_widget_digital_signature/users.py
+++ b/web_widget_digital_signature_user/__openerp__.py
@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 ##############################################################################
 #    
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
-#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd. (<http://www.serpentcs.com>).
+#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd.
+#    (<http://www.serpentcs.com>).
+#    Copyright 2015 Lorenzo Battistini - Agile Business Group
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU Affero General Public License as
@@ -20,12 +20,19 @@
 #
 ##############################################################################
 
-from openerp import models, fields, api
-
-class Users(models.Model):
-    _name = 'res.users'
-    _inherit = 'res.users'
-
-    signature_image= fields.Binary(string='Signature')
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
\ No newline at end of file
+{
+    "name" : "Web Digital Signature for users",
+    "version" : "8.0.1.0.0",
+    "author" : "Serpent Consulting Services Pvt. Ltd., "
+               "Odoo Community Association (OCA)",
+    "category": 'web',
+    "license": "AGPL-3",
+    'complexity': "easy",
+    'depends': ['web_widget_digital_signature'],
+    'data': [
+        'views/users_view.xml'
+    ],
+    'website': 'http://www.serpentcs.com',
+    'installable': True,
+    'auto_install': False,
+}
diff --git a/web_widget_digital_signature_user/models/__init__.py b/web_widget_digital_signature_user/models/__init__.py
new file mode 100644
index 00000000..e4cebb35
--- /dev/null
+++ b/web_widget_digital_signature_user/models/__init__.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd.
+#    (<http://www.serpentcs.com>).
+#    Copyright 2015 Lorenzo Battistini - Agile Business Group
+#
+#    About License, see __openerp__.py
+#
+##############################################################################
+
+from . import users
diff --git a/web_widget_digital_signature_user/models/users.py b/web_widget_digital_signature_user/models/users.py
new file mode 100644
index 00000000..a5d741ff
--- /dev/null
+++ b/web_widget_digital_signature_user/models/users.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+##############################################################################
+#    
+#    OpenERP, Open Source Management Solution
+#    Copyright (C) 2004-2010 OpenERP SA (<http://www.openerp.com>)
+#    Copyright (C) 2011-2015 Serpent Consulting Services Pvt. Ltd.
+#    (<http://www.serpentcs.com>).
+#
+#    About License, see __openerp__.py
+#
+##############################################################################
+
+from openerp import models, fields, api
+
+class Users(models.Model):
+    _name = 'res.users'
+    _inherit = 'res.users'
+
+    signature_image= fields.Binary(string='Signature')
diff --git a/web_widget_digital_signature_user/static/description/icon.png b/web_widget_digital_signature_user/static/description/icon.png
new file mode 100644
index 00000000..3a0328b5
Binary files /dev/null and b/web_widget_digital_signature_user/static/description/icon.png differ
diff --git a/web_widget_digital_signature/users_view.xml b/web_widget_digital_signature_user/views/users_view.xml
similarity index 100%
rename from web_widget_digital_signature/users_view.xml
rename to web_widget_digital_signature_user/views/users_view.xml