diff --git a/pubtools/__init__.py b/pubtools/__init__.py
deleted file mode 100644
index 7097d969..00000000
--- a/pubtools/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__path__ = __import__("pkgutil").extend_path(__path__, __name__)  # pragma: no cover
diff --git a/setup.py b/setup.py
index 3c51f602..743f758b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from setuptools import setup, find_packages
+from setuptools import setup, find_namespace_packages
 
 
 def get_description():
@@ -22,7 +22,8 @@ def get_requirements():
 setup(
     name="pubtools-pulp",
     version="1.23.0",
-    packages=find_packages(exclude=["tests"]),
+    packages=find_namespace_packages(where="src"),
+    package_dir={"": "src"},
     url="https://github.com/release-engineering/pubtools-pulp",
     license="GNU General Public License",
     description=get_description(),
diff --git a/pubtools/_pulp/__init__.py b/src/pubtools/_pulp/__init__.py
similarity index 100%
rename from pubtools/_pulp/__init__.py
rename to src/pubtools/_pulp/__init__.py
diff --git a/pubtools/_pulp/arguments.py b/src/pubtools/_pulp/arguments.py
similarity index 100%
rename from pubtools/_pulp/arguments.py
rename to src/pubtools/_pulp/arguments.py
diff --git a/pubtools/_pulp/hooks.py b/src/pubtools/_pulp/hooks.py
similarity index 100%
rename from pubtools/_pulp/hooks.py
rename to src/pubtools/_pulp/hooks.py
diff --git a/pubtools/_pulp/services/__init__.py b/src/pubtools/_pulp/services/__init__.py
similarity index 100%
rename from pubtools/_pulp/services/__init__.py
rename to src/pubtools/_pulp/services/__init__.py
diff --git a/pubtools/_pulp/services/base.py b/src/pubtools/_pulp/services/base.py
similarity index 100%
rename from pubtools/_pulp/services/base.py
rename to src/pubtools/_pulp/services/base.py
diff --git a/pubtools/_pulp/services/cachingpulp.py b/src/pubtools/_pulp/services/cachingpulp.py
similarity index 100%
rename from pubtools/_pulp/services/cachingpulp.py
rename to src/pubtools/_pulp/services/cachingpulp.py
diff --git a/pubtools/_pulp/services/collector.py b/src/pubtools/_pulp/services/collector.py
similarity index 100%
rename from pubtools/_pulp/services/collector.py
rename to src/pubtools/_pulp/services/collector.py
diff --git a/pubtools/_pulp/services/fakepulp.py b/src/pubtools/_pulp/services/fakepulp.py
similarity index 100%
rename from pubtools/_pulp/services/fakepulp.py
rename to src/pubtools/_pulp/services/fakepulp.py
diff --git a/pubtools/_pulp/services/fastpurge_.py b/src/pubtools/_pulp/services/fastpurge_.py
similarity index 100%
rename from pubtools/_pulp/services/fastpurge_.py
rename to src/pubtools/_pulp/services/fastpurge_.py
diff --git a/pubtools/_pulp/services/pulp.py b/src/pubtools/_pulp/services/pulp.py
similarity index 100%
rename from pubtools/_pulp/services/pulp.py
rename to src/pubtools/_pulp/services/pulp.py
diff --git a/pubtools/_pulp/services/udcache.py b/src/pubtools/_pulp/services/udcache.py
similarity index 100%
rename from pubtools/_pulp/services/udcache.py
rename to src/pubtools/_pulp/services/udcache.py
diff --git a/pubtools/_pulp/step.py b/src/pubtools/_pulp/step.py
similarity index 100%
rename from pubtools/_pulp/step.py
rename to src/pubtools/_pulp/step.py
diff --git a/pubtools/_pulp/task.py b/src/pubtools/_pulp/task.py
similarity index 100%
rename from pubtools/_pulp/task.py
rename to src/pubtools/_pulp/task.py
diff --git a/pubtools/_pulp/tasks/__init__.py b/src/pubtools/_pulp/tasks/__init__.py
similarity index 100%
rename from pubtools/_pulp/tasks/__init__.py
rename to src/pubtools/_pulp/tasks/__init__.py
diff --git a/pubtools/_pulp/tasks/clear_repo.py b/src/pubtools/_pulp/tasks/clear_repo.py
similarity index 100%
rename from pubtools/_pulp/tasks/clear_repo.py
rename to src/pubtools/_pulp/tasks/clear_repo.py
diff --git a/pubtools/_pulp/tasks/common.py b/src/pubtools/_pulp/tasks/common.py
similarity index 100%
rename from pubtools/_pulp/tasks/common.py
rename to src/pubtools/_pulp/tasks/common.py
diff --git a/pubtools/_pulp/tasks/delete.py b/src/pubtools/_pulp/tasks/delete.py
similarity index 100%
rename from pubtools/_pulp/tasks/delete.py
rename to src/pubtools/_pulp/tasks/delete.py
diff --git a/pubtools/_pulp/tasks/fix_cves.py b/src/pubtools/_pulp/tasks/fix_cves.py
similarity index 100%
rename from pubtools/_pulp/tasks/fix_cves.py
rename to src/pubtools/_pulp/tasks/fix_cves.py
diff --git a/pubtools/_pulp/tasks/garbage_collect.py b/src/pubtools/_pulp/tasks/garbage_collect.py
similarity index 100%
rename from pubtools/_pulp/tasks/garbage_collect.py
rename to src/pubtools/_pulp/tasks/garbage_collect.py
diff --git a/pubtools/_pulp/tasks/publish.py b/src/pubtools/_pulp/tasks/publish.py
similarity index 100%
rename from pubtools/_pulp/tasks/publish.py
rename to src/pubtools/_pulp/tasks/publish.py
diff --git a/pubtools/_pulp/tasks/push/__init__.py b/src/pubtools/_pulp/tasks/push/__init__.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/__init__.py
rename to src/pubtools/_pulp/tasks/push/__init__.py
diff --git a/pubtools/_pulp/tasks/push/command.py b/src/pubtools/_pulp/tasks/push/command.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/command.py
rename to src/pubtools/_pulp/tasks/push/command.py
diff --git a/pubtools/_pulp/tasks/push/contextlib_compat.py b/src/pubtools/_pulp/tasks/push/contextlib_compat.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/contextlib_compat.py
rename to src/pubtools/_pulp/tasks/push/contextlib_compat.py
diff --git a/pubtools/_pulp/tasks/push/copy.py b/src/pubtools/_pulp/tasks/push/copy.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/copy.py
rename to src/pubtools/_pulp/tasks/push/copy.py
diff --git a/pubtools/_pulp/tasks/push/items/__init__.py b/src/pubtools/_pulp/tasks/push/items/__init__.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/__init__.py
rename to src/pubtools/_pulp/tasks/push/items/__init__.py
diff --git a/pubtools/_pulp/tasks/push/items/base.py b/src/pubtools/_pulp/tasks/push/items/base.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/base.py
rename to src/pubtools/_pulp/tasks/push/items/base.py
diff --git a/pubtools/_pulp/tasks/push/items/comps.py b/src/pubtools/_pulp/tasks/push/items/comps.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/comps.py
rename to src/pubtools/_pulp/tasks/push/items/comps.py
diff --git a/pubtools/_pulp/tasks/push/items/direct.py b/src/pubtools/_pulp/tasks/push/items/direct.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/direct.py
rename to src/pubtools/_pulp/tasks/push/items/direct.py
diff --git a/pubtools/_pulp/tasks/push/items/erratum.py b/src/pubtools/_pulp/tasks/push/items/erratum.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/erratum.py
rename to src/pubtools/_pulp/tasks/push/items/erratum.py
diff --git a/pubtools/_pulp/tasks/push/items/erratum_conv.py b/src/pubtools/_pulp/tasks/push/items/erratum_conv.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/erratum_conv.py
rename to src/pubtools/_pulp/tasks/push/items/erratum_conv.py
diff --git a/pubtools/_pulp/tasks/push/items/file.py b/src/pubtools/_pulp/tasks/push/items/file.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/file.py
rename to src/pubtools/_pulp/tasks/push/items/file.py
diff --git a/pubtools/_pulp/tasks/push/items/modulemd.py b/src/pubtools/_pulp/tasks/push/items/modulemd.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/modulemd.py
rename to src/pubtools/_pulp/tasks/push/items/modulemd.py
diff --git a/pubtools/_pulp/tasks/push/items/productid.py b/src/pubtools/_pulp/tasks/push/items/productid.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/productid.py
rename to src/pubtools/_pulp/tasks/push/items/productid.py
diff --git a/pubtools/_pulp/tasks/push/items/rpm.py b/src/pubtools/_pulp/tasks/push/items/rpm.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/items/rpm.py
rename to src/pubtools/_pulp/tasks/push/items/rpm.py
diff --git a/pubtools/_pulp/tasks/push/phase/__init__.py b/src/pubtools/_pulp/tasks/push/phase/__init__.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/__init__.py
rename to src/pubtools/_pulp/tasks/push/phase/__init__.py
diff --git a/pubtools/_pulp/tasks/push/phase/associate.py b/src/pubtools/_pulp/tasks/push/phase/associate.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/associate.py
rename to src/pubtools/_pulp/tasks/push/phase/associate.py
diff --git a/pubtools/_pulp/tasks/push/phase/base.py b/src/pubtools/_pulp/tasks/push/phase/base.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/base.py
rename to src/pubtools/_pulp/tasks/push/phase/base.py
diff --git a/pubtools/_pulp/tasks/push/phase/buffer.py b/src/pubtools/_pulp/tasks/push/phase/buffer.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/buffer.py
rename to src/pubtools/_pulp/tasks/push/phase/buffer.py
diff --git a/pubtools/_pulp/tasks/push/phase/collect.py b/src/pubtools/_pulp/tasks/push/phase/collect.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/collect.py
rename to src/pubtools/_pulp/tasks/push/phase/collect.py
diff --git a/pubtools/_pulp/tasks/push/phase/constants.py b/src/pubtools/_pulp/tasks/push/phase/constants.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/constants.py
rename to src/pubtools/_pulp/tasks/push/phase/constants.py
diff --git a/pubtools/_pulp/tasks/push/phase/context.py b/src/pubtools/_pulp/tasks/push/phase/context.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/context.py
rename to src/pubtools/_pulp/tasks/push/phase/context.py
diff --git a/pubtools/_pulp/tasks/push/phase/end_push.py b/src/pubtools/_pulp/tasks/push/phase/end_push.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/end_push.py
rename to src/pubtools/_pulp/tasks/push/phase/end_push.py
diff --git a/pubtools/_pulp/tasks/push/phase/errors.py b/src/pubtools/_pulp/tasks/push/phase/errors.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/errors.py
rename to src/pubtools/_pulp/tasks/push/phase/errors.py
diff --git a/pubtools/_pulp/tasks/push/phase/load_items.py b/src/pubtools/_pulp/tasks/push/phase/load_items.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/load_items.py
rename to src/pubtools/_pulp/tasks/push/phase/load_items.py
diff --git a/pubtools/_pulp/tasks/push/phase/load_sums.py b/src/pubtools/_pulp/tasks/push/phase/load_sums.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/load_sums.py
rename to src/pubtools/_pulp/tasks/push/phase/load_sums.py
diff --git a/pubtools/_pulp/tasks/push/phase/progress.py b/src/pubtools/_pulp/tasks/push/phase/progress.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/progress.py
rename to src/pubtools/_pulp/tasks/push/phase/progress.py
diff --git a/pubtools/_pulp/tasks/push/phase/publish.py b/src/pubtools/_pulp/tasks/push/phase/publish.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/publish.py
rename to src/pubtools/_pulp/tasks/push/phase/publish.py
diff --git a/pubtools/_pulp/tasks/push/phase/push_post_actions.py b/src/pubtools/_pulp/tasks/push/phase/push_post_actions.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/push_post_actions.py
rename to src/pubtools/_pulp/tasks/push/phase/push_post_actions.py
diff --git a/pubtools/_pulp/tasks/push/phase/query_pulp.py b/src/pubtools/_pulp/tasks/push/phase/query_pulp.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/query_pulp.py
rename to src/pubtools/_pulp/tasks/push/phase/query_pulp.py
diff --git a/pubtools/_pulp/tasks/push/phase/update.py b/src/pubtools/_pulp/tasks/push/phase/update.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/update.py
rename to src/pubtools/_pulp/tasks/push/phase/update.py
diff --git a/pubtools/_pulp/tasks/push/phase/upload.py b/src/pubtools/_pulp/tasks/push/phase/upload.py
similarity index 100%
rename from pubtools/_pulp/tasks/push/phase/upload.py
rename to src/pubtools/_pulp/tasks/push/phase/upload.py
diff --git a/pubtools/_pulp/tasks/set_maintenance/__init__.py b/src/pubtools/_pulp/tasks/set_maintenance/__init__.py
similarity index 100%
rename from pubtools/_pulp/tasks/set_maintenance/__init__.py
rename to src/pubtools/_pulp/tasks/set_maintenance/__init__.py
diff --git a/pubtools/_pulp/tasks/set_maintenance/base.py b/src/pubtools/_pulp/tasks/set_maintenance/base.py
similarity index 100%
rename from pubtools/_pulp/tasks/set_maintenance/base.py
rename to src/pubtools/_pulp/tasks/set_maintenance/base.py
diff --git a/pubtools/_pulp/tasks/set_maintenance/set_maintenance_off.py b/src/pubtools/_pulp/tasks/set_maintenance/set_maintenance_off.py
similarity index 100%
rename from pubtools/_pulp/tasks/set_maintenance/set_maintenance_off.py
rename to src/pubtools/_pulp/tasks/set_maintenance/set_maintenance_off.py
diff --git a/pubtools/_pulp/tasks/set_maintenance/set_maintenance_on.py b/src/pubtools/_pulp/tasks/set_maintenance/set_maintenance_on.py
similarity index 100%
rename from pubtools/_pulp/tasks/set_maintenance/set_maintenance_on.py
rename to src/pubtools/_pulp/tasks/set_maintenance/set_maintenance_on.py
diff --git a/pubtools/_pulp/ud.py b/src/pubtools/_pulp/ud.py
similarity index 100%
rename from pubtools/_pulp/ud.py
rename to src/pubtools/_pulp/ud.py