diff --git a/pytestpavement/__init__.py b/pytestpavement/__init__.py
deleted file mode 100644
index e2e8843..0000000
--- a/pytestpavement/__init__.py
+++ /dev/null
@@ -1,8 +0,0 @@
-# main __init__.py
-
-from pytestpavement.analysis import *
-from pytestpavement.functions import *
-from pytestpavement.helper import *
-from pytestpavement.io import *
-from pytestpavement.labtests import *
-from pytestpavement.models import *
diff --git a/setup.py b/setup.py
index e2d9f66..4aa5618 100644
--- a/setup.py
+++ b/setup.py
@@ -1,19 +1,21 @@
-from setuptools import setup
+#!/usr/bin/env python
+
+from setuptools import find_packages, setup
 
-name = 'PyTestPavement'
-version = '0.01'
-release = '0.0.1'
 setup(
-    name=name,
+    name='PyTestPavement',
+    version='0.1',
     author='Markus Clauß',
     author_email='markus.clauss@tu-dresden.de',
-    version=release,
     install_requires=[
         'lmfit',
         'pandas',
         'numpy',
         'scipy',
+        'matplotlib',  #remove later
+        'seaborn',  #remove later
         'mongoengine',
     ],
-    packages=['pytestpavement'],
-)
+    packages=find_packages(where="src"),
+    package_dir={"": "src"},
+    include_package_data=True)
diff --git a/src/pytestpavement/__init__.py b/src/pytestpavement/__init__.py
new file mode 100644
index 0000000..5656f4e
--- /dev/null
+++ b/src/pytestpavement/__init__.py
@@ -0,0 +1,7 @@
+# main __init__.py
+from .analysis import *
+from .functions import *
+from .helper import *
+from .io import *
+from .labtests import *
+from .models import *
diff --git a/pytestpavement/analysis/__init__.py b/src/pytestpavement/analysis/__init__.py
similarity index 100%
rename from pytestpavement/analysis/__init__.py
rename to src/pytestpavement/analysis/__init__.py
diff --git a/pytestpavement/analysis/regression.py b/src/pytestpavement/analysis/regression.py
similarity index 100%
rename from pytestpavement/analysis/regression.py
rename to src/pytestpavement/analysis/regression.py
diff --git a/pytestpavement/functions/__init__.py b/src/pytestpavement/functions/__init__.py
similarity index 100%
rename from pytestpavement/functions/__init__.py
rename to src/pytestpavement/functions/__init__.py
diff --git a/pytestpavement/functions/citt.py b/src/pytestpavement/functions/citt.py
similarity index 100%
rename from pytestpavement/functions/citt.py
rename to src/pytestpavement/functions/citt.py
diff --git a/pytestpavement/helper/__init__.py b/src/pytestpavement/helper/__init__.py
similarity index 100%
rename from pytestpavement/helper/__init__.py
rename to src/pytestpavement/helper/__init__.py
diff --git a/pytestpavement/helper/filehasher.py b/src/pytestpavement/helper/filehasher.py
similarity index 100%
rename from pytestpavement/helper/filehasher.py
rename to src/pytestpavement/helper/filehasher.py
diff --git a/pytestpavement/io/__init__.py b/src/pytestpavement/io/__init__.py
similarity index 100%
rename from pytestpavement/io/__init__.py
rename to src/pytestpavement/io/__init__.py
diff --git a/pytestpavement/io/geosys.py b/src/pytestpavement/io/geosys.py
similarity index 98%
rename from pytestpavement/io/geosys.py
rename to src/pytestpavement/io/geosys.py
index 66f3a62..6bb848e 100644
--- a/pytestpavement/io/geosys.py
+++ b/src/pytestpavement/io/geosys.py
@@ -3,8 +3,7 @@ import os
 from sys import getsizeof
 
 from numpy import array
-from pandas import DataFrame, to_datetime
-from versuche.helper import normalice_header
+from pandas import DataFrame
 
 
 def detect_tabnum(filename, tabstr, encoding='utf-8'):
diff --git a/pytestpavement/io/hash.py b/src/pytestpavement/io/hash.py
similarity index 100%
rename from pytestpavement/io/hash.py
rename to src/pytestpavement/io/hash.py
diff --git a/pytestpavement/io/mongo.py b/src/pytestpavement/io/mongo.py
similarity index 100%
rename from pytestpavement/io/mongo.py
rename to src/pytestpavement/io/mongo.py
diff --git a/pytestpavement/labtests/__init__.py b/src/pytestpavement/labtests/__init__.py
similarity index 100%
rename from pytestpavement/labtests/__init__.py
rename to src/pytestpavement/labtests/__init__.py
diff --git a/pytestpavement/labtests/base.py b/src/pytestpavement/labtests/base.py
similarity index 100%
rename from pytestpavement/labtests/base.py
rename to src/pytestpavement/labtests/base.py
diff --git a/pytestpavement/labtests/citt.py b/src/pytestpavement/labtests/citt.py
similarity index 100%
rename from pytestpavement/labtests/citt.py
rename to src/pytestpavement/labtests/citt.py
diff --git a/pytestpavement/labtests/dsv.py b/src/pytestpavement/labtests/dsv.py
similarity index 100%
rename from pytestpavement/labtests/dsv.py
rename to src/pytestpavement/labtests/dsv.py
diff --git a/pytestpavement/labtests/sheartest.py b/src/pytestpavement/labtests/sheartest.py
similarity index 100%
rename from pytestpavement/labtests/sheartest.py
rename to src/pytestpavement/labtests/sheartest.py
diff --git a/pytestpavement/models/__init__.py b/src/pytestpavement/models/__init__.py
similarity index 100%
rename from pytestpavement/models/__init__.py
rename to src/pytestpavement/models/__init__.py
diff --git a/pytestpavement/models/citt.py b/src/pytestpavement/models/citt.py
similarity index 100%
rename from pytestpavement/models/citt.py
rename to src/pytestpavement/models/citt.py
diff --git a/pytestpavement/models/data.py b/src/pytestpavement/models/data.py
similarity index 100%
rename from pytestpavement/models/data.py
rename to src/pytestpavement/models/data.py
diff --git a/pytestpavement/models/material.py b/src/pytestpavement/models/material.py
similarity index 100%
rename from pytestpavement/models/material.py
rename to src/pytestpavement/models/material.py
diff --git a/pytestpavement/models/sheartest.py b/src/pytestpavement/models/sheartest.py
similarity index 100%
rename from pytestpavement/models/sheartest.py
rename to src/pytestpavement/models/sheartest.py