diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..d089a99
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,15 @@
+Version 8.0
+
+Valentin LAB with sudokeys
+
+Version 7.0
+
+Valentin LAB with tuxservices for CARIF/OREF
+
+Version 6.1
+ 
+Valentin LAB with simplee.fr for CARIF/OREF 
+
+Version 6.0
+
+Boris Timokhin, Dmitry, Zhuravlev-Nevsky for InfoSreda LLC
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..9aa03b3
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,12 @@
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/__init__.py b/__init__.py
new file mode 100644
index 0000000..16cdc22
--- /dev/null
+++ b/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+import gmap  ## flake8: noqa
diff --git a/web_google_map/__openerp__.py b/__openerp__.py
similarity index 61%
rename from web_google_map/__openerp__.py
rename to __openerp__.py
index 548bc16..db76c86 100644
--- a/web_google_map/__openerp__.py
+++ b/__openerp__.py
@@ -1,25 +1,5 @@
 # -*- coding: utf-8 -*-
 
-##############################################################################
-#
-#    Authors: Valentin LAB for simplee.fr and Boris Timokhin, Dmitry
-#    Zhuravlev-Nevsky for InfoSreda LLC
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
 {
     'name': 'Web Map',
     'version': '0.4.0',
diff --git a/gmap.py b/gmap.py
new file mode 100644
index 0000000..583a2e8
--- /dev/null
+++ b/gmap.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+from openerp.osv import osv, fields
+
+
+class res_partner(osv.osv):
+
+    _name = 'res.partner'
+    _inherit = 'res.partner'
+
+    _columns = {
+        'lat': fields.float(u'Latitude', digits=(9, 6)),
+        'lng': fields.float(u'Longitude', digits=(9, 6)),
+        'map': fields.dummy(),
+    }
+
+res_partner()
diff --git a/web_google_map/gmap_view.xml b/gmap_view.xml
similarity index 100%
rename from web_google_map/gmap_view.xml
rename to gmap_view.xml
diff --git a/web_google_map/i18n/fr.po b/i18n/fr.po
similarity index 100%
rename from web_google_map/i18n/fr.po
rename to i18n/fr.po
diff --git a/web_google_map/i18n/web_google_map.pot b/i18n/web_google_map.pot
similarity index 100%
rename from web_google_map/i18n/web_google_map.pot
rename to i18n/web_google_map.pot
diff --git a/web_google_map/images/map.png b/images/map.png
similarity index 100%
rename from web_google_map/images/map.png
rename to images/map.png
diff --git a/web_google_map/static/lib/js/jquery.ui.map.js b/static/lib/js/jquery.ui.map.js
similarity index 100%
rename from web_google_map/static/lib/js/jquery.ui.map.js
rename to static/lib/js/jquery.ui.map.js
diff --git a/web_google_map/static/src/css/gmap.css b/static/src/css/gmap.css
similarity index 100%
rename from web_google_map/static/src/css/gmap.css
rename to static/src/css/gmap.css
diff --git a/web_google_map/static/src/js/gmap.js b/static/src/js/gmap.js
similarity index 100%
rename from web_google_map/static/src/js/gmap.js
rename to static/src/js/gmap.js
diff --git a/web_google_map/static/src/xml/base.xml b/static/src/xml/base.xml
similarity index 100%
rename from web_google_map/static/src/xml/base.xml
rename to static/src/xml/base.xml
diff --git a/web_google_map/__init__.py b/web_google_map/__init__.py
deleted file mode 100644
index 4be65a8..0000000
--- a/web_google_map/__init__.py
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- coding: utf-8 -*-
-
-##############################################################################
-#
-#    Authors: Boris Timokhin, Dmitry Zhuravlev-Nevsky. Copyright InfoSreda LLC
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-import gmap
diff --git a/web_google_map/gmap.py b/web_google_map/gmap.py
deleted file mode 100644
index 0143273..0000000
--- a/web_google_map/gmap.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-
-##############################################################################
-#
-#    Authors: Boris Timokhin, Dmitry Zhuravlev-Nevsky. Copyright InfoSreda LLC
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU 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 General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-from openerp.osv import osv
-from openerp.osv import fields
-
-
-class res_partner(osv.osv):
-
-    _name = 'res.partner'
-    _inherit = 'res.partner'
-
-    _columns = {
-        'lat': fields.float(u'Latitude', digits=(9, 6)),
-        'lng': fields.float(u'Longitude', digits=(9, 6)),
-        'map': fields.dummy(),
-    }
-
-res_partner()