diff --git a/setup.cfg b/setup.cfg
index 008079418caa211b4b790ab6c47c5b3570f34bca..3b0a9db7d099a94e0ba62d1168021e4b196e9f60 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [metadata]
-name = thomaswoehlke-covid19python
+name = covid19python-thomaswoehlke
 version = 0.0.19
 url = https://github.com/thomaswoehlke/covid19python.git
 author = Thomas Woehlke
diff --git a/setup.py b/setup.py
index d694f0208cd460c15822cd23eb1989da048fc70c..35aa9336134d5f8bc8952bc4ede0779006dbf818 100644
--- a/setup.py
+++ b/setup.py
@@ -463,7 +463,7 @@ for kw in keywords_list:
 packages = find_packages()
 
 setup(
-    name='thomaswoehlke-covid19python',
+    name='covid19python-thomaswoehlke',
     version=version,
     url='ttps://github.com/thomaswoehlke/covid19python.git',
     license='GNU General Public License v3 (GPLv3)',
diff --git a/tests/__init__.py b/src/tests/__init__.py
similarity index 100%
rename from tests/__init__.py
rename to src/tests/__init__.py
diff --git a/tests/config.py b/src/tests/config.py
similarity index 100%
rename from tests/config.py
rename to src/tests/config.py
diff --git a/tests/conftest.py b/src/tests/conftest.py
similarity index 100%
rename from tests/conftest.py
rename to src/tests/conftest.py
diff --git a/tests/covid19/blueprints/__init__.py b/src/tests/covid19/blueprints/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/__init__.py
rename to src/tests/covid19/blueprints/__init__.py
diff --git a/tests/covid19/blueprints/admin/__init__.py b/src/tests/covid19/blueprints/admin/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/admin/__init__.py
rename to src/tests/covid19/blueprints/admin/__init__.py
diff --git a/tests/covid19/blueprints/admin/test_admin_views.py b/src/tests/covid19/blueprints/admin/test_admin_views.py
similarity index 100%
rename from tests/covid19/blueprints/admin/test_admin_views.py
rename to src/tests/covid19/blueprints/admin/test_admin_views.py
diff --git a/tests/covid19/blueprints/application/__init__.py b/src/tests/covid19/blueprints/application/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/application/__init__.py
rename to src/tests/covid19/blueprints/application/__init__.py
diff --git a/tests/covid19/blueprints/application/test_application_views.py b/src/tests/covid19/blueprints/application/test_application_views.py
similarity index 100%
rename from tests/covid19/blueprints/application/test_application_views.py
rename to src/tests/covid19/blueprints/application/test_application_views.py
diff --git a/tests/covid19/blueprints/ecdc/__init__.py b/src/tests/covid19/blueprints/ecdc/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/ecdc/__init__.py
rename to src/tests/covid19/blueprints/ecdc/__init__.py
diff --git a/tests/covid19/blueprints/owid/__init__.py b/src/tests/covid19/blueprints/owid/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/owid/__init__.py
rename to src/tests/covid19/blueprints/owid/__init__.py
diff --git a/tests/covid19/blueprints/owid/test_owid.py b/src/tests/covid19/blueprints/owid/test_owid.py
similarity index 100%
rename from tests/covid19/blueprints/owid/test_owid.py
rename to src/tests/covid19/blueprints/owid/test_owid.py
diff --git a/tests/covid19/blueprints/rki_bundeslaender/__init__.py b/src/tests/covid19/blueprints/rki_bundeslaender/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/rki_bundeslaender/__init__.py
rename to src/tests/covid19/blueprints/rki_bundeslaender/__init__.py
diff --git a/tests/covid19/blueprints/rki_landkreise/__init__.py b/src/tests/covid19/blueprints/rki_landkreise/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/rki_landkreise/__init__.py
rename to src/tests/covid19/blueprints/rki_landkreise/__init__.py
diff --git a/tests/covid19/blueprints/rki_vaccination/__init__.py b/src/tests/covid19/blueprints/rki_vaccination/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/rki_vaccination/__init__.py
rename to src/tests/covid19/blueprints/rki_vaccination/__init__.py
diff --git a/tests/covid19/blueprints/who/__init__.py b/src/tests/covid19/blueprints/who/__init__.py
similarity index 100%
rename from tests/covid19/blueprints/who/__init__.py
rename to src/tests/covid19/blueprints/who/__init__.py
diff --git a/tests/covid19/blueprints/who/test_who_views.py b/src/tests/covid19/blueprints/who/test_who_views.py
similarity index 100%
rename from tests/covid19/blueprints/who/test_who_views.py
rename to src/tests/covid19/blueprints/who/test_who_views.py
diff --git a/tests/test_mq.py b/src/tests/test_mq.py
similarity index 100%
rename from tests/test_mq.py
rename to src/tests/test_mq.py
diff --git a/tests/test_web.py b/src/tests/test_web.py
similarity index 100%
rename from tests/test_web.py
rename to src/tests/test_web.py