diff --git a/server/lib/python/heremaps/__init__.py b/server/lib/python/heremaps/heremaps/__init__.py
similarity index 100%
rename from server/lib/python/heremaps/__init__.py
rename to server/lib/python/heremaps/heremaps/__init__.py
diff --git a/server/lib/python/heremaps/heremapsexceptions.py b/server/lib/python/heremaps/heremaps/heremapsexceptions.py
similarity index 100%
rename from server/lib/python/heremaps/heremapsexceptions.py
rename to server/lib/python/heremaps/heremaps/heremapsexceptions.py
diff --git a/server/lib/python/heremaps/heremapsgeocoder.py b/server/lib/python/heremaps/heremaps/heremapsgeocoder.py
similarity index 100%
rename from server/lib/python/heremaps/heremapsgeocoder.py
rename to server/lib/python/heremaps/heremaps/heremapsgeocoder.py
diff --git a/server/lib/python/heremaps/tests/__init__.py b/server/lib/python/heremaps/heremaps/tests/__init__.py
similarity index 100%
rename from server/lib/python/heremaps/tests/__init__.py
rename to server/lib/python/heremaps/heremaps/tests/__init__.py
diff --git a/server/lib/python/heremaps/tests/heremapsgeocoder_tests.py b/server/lib/python/heremaps/heremaps/tests/heremapsgeocoder_tests.py
similarity index 100%
rename from server/lib/python/heremaps/tests/heremapsgeocoder_tests.py
rename to server/lib/python/heremaps/heremaps/tests/heremapsgeocoder_tests.py
diff --git a/server/lib/python/heremaps/setup.py b/server/lib/python/heremaps/setup.py
new file mode 100644
index 0000000..d11ae40
--- /dev/null
+++ b/server/lib/python/heremaps/setup.py
@@ -0,0 +1,41 @@
+"""
+A Here Maps API Python wrapper
+
+See:
+https://developer.here.com
+https://github.com/CartoDB/geocoder-api
+"""
+
+from setuptools import setup, find_packages
+
+setup(
+    name='heremaps',
+
+    version='0.0.1',
+
+    description='A Here Maps API Python wrapper',
+
+    url='https://github.com/CartoDB/geocoder-api',
+
+    author='Data Services Team - CartoDB',
+    author_email='dataservices@cartodb.com',
+
+    license='MIT',
+
+    classifiers=[
+        'Development Status :: 5 - Production',
+        'Intended Audience :: Mapping comunity',
+        'Topic :: Maps :: Mapping Tools',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 2.7',
+    ],
+
+    keywords='maps api mapping tools',
+
+    packages=find_packages(exclude=['contrib', 'docs', 'tests']),
+
+    extras_require={
+        'dev': ['unittest'],
+        'test': ['unittest'],
+    }
+)