diff --git a/setup.cfg b/setup.cfg
index 6c11b8b..277e104 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,6 +9,7 @@ url = https://github.com/rhkarls/sondera
 project_urls =
     Bug Tracker = https://github.com/rhkarls/sondera/issues
 classifiers =
+    Development Status :: 2 - Pre-Alpha
     License :: OSI Approved :: MIT License
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.8
@@ -17,7 +18,9 @@ classifiers =
 
 [options]
 python_requires = >= 3.8
-packages = sondera
+package_dir=
+    =src
+packages = find:
 zip_safe = False
 install_requires =
     numpy
@@ -26,6 +29,9 @@ install_requires =
 	requests
     tqdm
 
+[options.packages.find]
+where = src
+
 [options.extras_require]
 test =
     pytest
diff --git a/sondera/__init__.py b/src/sondera/__init__.py
similarity index 72%
rename from sondera/__init__.py
rename to src/sondera/__init__.py
index 464774e..3463a04 100644
--- a/sondera/__init__.py
+++ b/src/sondera/__init__.py
@@ -3,7 +3,3 @@
 __author__ = """Reinert Huseby Karlsen"""
 __email__ = ''
 __version__ = '0.0.1'
-
-from .clients import smhi
-
-__all__ = [smhi]
diff --git a/sondera/clients/__init__.py b/src/sondera/clients/__init__.py
similarity index 100%
rename from sondera/clients/__init__.py
rename to src/sondera/clients/__init__.py
diff --git a/sondera/clients/parameters.py b/src/sondera/clients/parameters.py
similarity index 100%
rename from sondera/clients/parameters.py
rename to src/sondera/clients/parameters.py
diff --git a/sondera/clients/sgu/__init__.py b/src/sondera/clients/sgu/__init__.py
similarity index 100%
rename from sondera/clients/sgu/__init__.py
rename to src/sondera/clients/sgu/__init__.py
diff --git a/sondera/clients/sgu/groundwater.py b/src/sondera/clients/sgu/groundwater.py
similarity index 100%
rename from sondera/clients/sgu/groundwater.py
rename to src/sondera/clients/sgu/groundwater.py
diff --git a/sondera/clients/smhi/__init__.py b/src/sondera/clients/smhi/__init__.py
similarity index 100%
rename from sondera/clients/smhi/__init__.py
rename to src/sondera/clients/smhi/__init__.py
diff --git a/sondera/clients/smhi/hydroobs.py b/src/sondera/clients/smhi/hydroobs.py
similarity index 100%
rename from sondera/clients/smhi/hydroobs.py
rename to src/sondera/clients/smhi/hydroobs.py
diff --git a/sondera/clients/smhi/metobs.py b/src/sondera/clients/smhi/metobs.py
similarity index 100%
rename from sondera/clients/smhi/metobs.py
rename to src/sondera/clients/smhi/metobs.py
diff --git a/sondera/clients/smhi/smhistrang.py b/src/sondera/clients/smhi/smhistrang.py
similarity index 100%
rename from sondera/clients/smhi/smhistrang.py
rename to src/sondera/clients/smhi/smhistrang.py
diff --git a/sondera/datatypes.py b/src/sondera/datatypes.py
similarity index 100%
rename from sondera/datatypes.py
rename to src/sondera/datatypes.py
diff --git a/sondera/exceptions.py b/src/sondera/exceptions.py
similarity index 100%
rename from sondera/exceptions.py
rename to src/sondera/exceptions.py
diff --git a/sondera/geo_utils.py b/src/sondera/geo_utils.py
similarity index 100%
rename from sondera/geo_utils.py
rename to src/sondera/geo_utils.py