diff --git a/frechetdist/frechetdist.py b/frechetdist.py
similarity index 100%
rename from frechetdist/frechetdist.py
rename to frechetdist.py
diff --git a/frechetdist/__init__.py b/frechetdist/__init__.py
deleted file mode 100644
index c497e08..0000000
--- a/frechetdist/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from frechetdist import frdist
-__version__ = '0.3'
diff --git a/setup.py b/setup.py
index 533bea8..28367ee 100644
--- a/setup.py
+++ b/setup.py
@@ -1,14 +1,25 @@
-from setuptools import setup
+import setuptools
 
-setup(name='frechetdist',
-      version='0.3',
-      description='Calculate discrete Frechet distance',
-      url='https://github.com/spiros/discrete_frechet',
-      author='Spiros Denaxas',
-      author_email='s.denaxas@gmail.com',
-      license='Apache License 2.0',
-      packages=['frechetdist'],
-      install_requires=[
-          'numpy',
-      ],
-      zip_safe=False)
\ No newline at end of file
+with open("README.md", "r") as fh:
+    long_description = fh.read()
+
+setuptools.setup(
+    name='frechetdist',
+    version='0.6',
+    description='Calculate discrete Frechet distance',
+    url='https://github.com/spiros/discrete_frechet',
+    author='Spiros Denaxas',
+    author_email='s.denaxas@gmail.com',
+    long_description=long_description,
+    long_description_content_type="text/markdown",
+    license='Apache License 2.0',
+    py_modules=['frechetdist'],
+    install_requires=[
+        'numpy>1.0',
+    ],
+    zip_safe=False,
+    classifiers=[
+        "Programming Language :: Python :: 3",
+        "Operating System :: OS Independent"
+    ]
+)
diff --git a/frechetdist/tests/test_all.py b/test_all.py
similarity index 92%
rename from frechetdist/tests/test_all.py
rename to test_all.py
index c177c0b..0de2117 100644
--- a/frechetdist/tests/test_all.py
+++ b/test_all.py
@@ -4,9 +4,6 @@
 import numpy as np
 import pytest
 
-MYPATH = os.path.dirname(os.path.abspath(__file__))
-sys.path.insert(0, MYPATH + '/../')
-
 from frechetdist import frdist
 
 TEST_CASES = [