diff --git a/PKG-INFO b/PKG-INFO
index c8c88e4..c5765c1 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: swh.loader.dir
-Version: 0.0.28
+Version: 0.0.29
 Summary: Software Heritage Directory Loader
 Home-page: https://forge.softwareheritage.org/diffusion/DLDDIR
 Author: Software Heritage developers
 Author-email: swh-devel@inria.fr
 License: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
diff --git a/debian/rules b/debian/rules
index 24f959b..a1bb652 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,12 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-loader-dir
-export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs swh/loader/dir/tests
+export PYBUILD_NAME=swh.loader.dir
+export export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
+
+override_dh_install:
+	dh_install
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/__init__.py
+	rm -v $(CURDIR)/debian/python3-*/usr/lib/python*/dist-packages/swh/loader/__init__.py
diff --git a/setup.py b/setup.py
index 8919cf3..031ad79 100644
--- a/setup.py
+++ b/setup.py
@@ -1,29 +1,28 @@
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def parse_requirements():
     requirements = []
     for reqf in ('requirements.txt', 'requirements-swh.txt'):
         with open(reqf) as f:
             for line in f.readlines():
                 line = line.strip()
                 if not line or line.startswith('#'):
                     continue
                 requirements.append(line)
     return requirements
 
 
 setup(
     name='swh.loader.dir',
     description='Software Heritage Directory Loader',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DLDDIR',
-    packages=['swh.loader.dir',
-              'swh.loader.dir.tests'],
+    packages=find_packages(),
     scripts=[],
     install_requires=parse_requirements(),
     setup_requires=['vcversioner'],
     vcversioner={},
     include_package_data=True,
 )
diff --git a/swh.loader.dir.egg-info/PKG-INFO b/swh.loader.dir.egg-info/PKG-INFO
index c8c88e4..c5765c1 100644
--- a/swh.loader.dir.egg-info/PKG-INFO
+++ b/swh.loader.dir.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: swh.loader.dir
-Version: 0.0.28
+Version: 0.0.29
 Summary: Software Heritage Directory Loader
 Home-page: https://forge.softwareheritage.org/diffusion/DLDDIR
 Author: Software Heritage developers
 Author-email: swh-devel@inria.fr
 License: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
diff --git a/swh.loader.dir.egg-info/SOURCES.txt b/swh.loader.dir.egg-info/SOURCES.txt
index 17f0055..b02352b 100644
--- a/swh.loader.dir.egg-info/SOURCES.txt
+++ b/swh.loader.dir.egg-info/SOURCES.txt
@@ -1,38 +1,40 @@
 .gitignore
 AUTHORS
 LICENSE
 MANIFEST.in
 Makefile
 Makefile.local
 README.md
 requirements-swh.txt
 requirements.txt
 setup.py
 version.txt
 bin/swh-check-missing-objects.py
 bin/swh-loader-dir
 debian/changelog
 debian/compat
 debian/control
 debian/copyright
 debian/rules
 debian/source/format
 docs/.gitignore
 docs/Makefile
 docs/conf.py
 docs/index.rst
 docs/_static/.placeholder
 docs/_templates/.placeholder
 resources/dir.yml
 resources/loader/dir.yml
+swh/__init__.py
 swh.loader.dir.egg-info/PKG-INFO
 swh.loader.dir.egg-info/SOURCES.txt
 swh.loader.dir.egg-info/dependency_links.txt
 swh.loader.dir.egg-info/requires.txt
 swh.loader.dir.egg-info/top_level.txt
+swh/loader/__init__.py
 swh/loader/dir/__init__.py
 swh/loader/dir/converters.py
 swh/loader/dir/loader.py
 swh/loader/dir/tasks.py
 swh/loader/dir/tests/test_converters.py
 swh/loader/dir/tests/test_loader.py
\ No newline at end of file
diff --git a/swh/__init__.py b/swh/__init__.py
new file mode 100644
index 0000000..69e3be5
--- /dev/null
+++ b/swh/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/swh/loader/__init__.py b/swh/loader/__init__.py
new file mode 100644
index 0000000..69e3be5
--- /dev/null
+++ b/swh/loader/__init__.py
@@ -0,0 +1 @@
+__path__ = __import__('pkgutil').extend_path(__path__, __name__)
diff --git a/version.txt b/version.txt
index daaa850..d6ba0ad 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.0.28-0-gdf6f46f
\ No newline at end of file
+v0.0.29-0-g5536812
\ No newline at end of file