diff --git a/PKG-INFO b/PKG-INFO
index 3bb8159..e8cff30 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: swh.lister
-Version: 0.0.6
+Version: 0.0.7
 Summary: Software Heritage GitHub lister
 Home-page: https://forge.softwareheritage.org/diffusion/DLSGH/
 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 d0ebfa4..49bdd90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,11 @@
 #!/usr/bin/make -f
 
-export PYBUILD_NAME=swh-lister
-export PYBUILD_TEST_ARGS=--with-doctest -sv -a !db,!fs swh/lister
+export PYBUILD_NAME=swh.lister
+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
diff --git a/setup.py b/setup.py
index 74ec27b..e1d86ac 100644
--- a/setup.py
+++ b/setup.py
@@ -1,30 +1,30 @@
 #!/usr/bin/env python3
 
-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.lister',
     description='Software Heritage GitHub lister',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DLSGH/',
-    packages=['swh.lister'],
+    packages=find_packages(),
     scripts=['bin/ghlister'],
     install_requires=parse_requirements(),
     setup_requires=['vcversioner'],
     vcversioner={'version_module_paths': ['swh/lister/_version.py']},
     include_package_data=True,
 )
diff --git a/swh.lister.egg-info/PKG-INFO b/swh.lister.egg-info/PKG-INFO
index 3bb8159..e8cff30 100644
--- a/swh.lister.egg-info/PKG-INFO
+++ b/swh.lister.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: swh.lister
-Version: 0.0.6
+Version: 0.0.7
 Summary: Software Heritage GitHub lister
 Home-page: https://forge.softwareheritage.org/diffusion/DLSGH/
 Author: Software Heritage developers
 Author-email: swh-devel@inria.fr
 License: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
diff --git a/swh.lister.egg-info/SOURCES.txt b/swh.lister.egg-info/SOURCES.txt
index 78daf35..588144d 100644
--- a/swh.lister.egg-info/SOURCES.txt
+++ b/swh.lister.egg-info/SOURCES.txt
@@ -1,61 +1,61 @@
 .gitignore
 ACKNOWLEDGEMENTS
 LICENSE
 MANIFEST.in
 Makefile
 README
 TODO
 requirements-swh.txt
 requirements.txt
 setup.py
 version.txt
 bin/batch
 bin/ghlister
 bin/reset.sh
 bin/status
 debian/changelog
 debian/clean
 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
 etc/crontab
 sql/crawler.sql
 sql/pimp_db.sql
+swh/__init__.py
 swh.lister.egg-info/PKG-INFO
 swh.lister.egg-info/SOURCES.txt
 swh.lister.egg-info/dependency_links.txt
 swh.lister.egg-info/requires.txt
 swh.lister.egg-info/top_level.txt
-swh/lister/_version.py
 swh/lister/bitbucket/lister.py
 swh/lister/bitbucket/models.py
 swh/lister/bitbucket/tasks.py
 swh/lister/bitbucket/tests/api_empty_response.json
 swh/lister/bitbucket/tests/api_response.json
 swh/lister/bitbucket/tests/test_bb_lister.py
 swh/lister/core/abstractattribute.py
 swh/lister/core/db_utils.py
 swh/lister/core/indexing_lister.py
 swh/lister/core/lister_base.py
 swh/lister/core/lister_transports.py
 swh/lister/core/models.py
 swh/lister/core/tasks.py
 swh/lister/core/tests/test_abstractattribute.py
 swh/lister/core/tests/test_lister.py
 swh/lister/core/tests/test_model.py
 swh/lister/debian/lister.py
 swh/lister/debian/utils.py
 swh/lister/github/lister.py
 swh/lister/github/models.py
 swh/lister/github/tasks.py
 swh/lister/github/tests/api_empty_response.json
 swh/lister/github/tests/api_response.json
 swh/lister/github/tests/test_gh_lister.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/lister/_version.py b/swh/lister/_version.py
deleted file mode 100644
index 3a549e9..0000000
--- a/swh/lister/_version.py
+++ /dev/null
@@ -1,5 +0,0 @@
-
-# This file is automatically generated by setup.py.
-__version__ = '0.0.6'
-__sha__ = 'g751b64b'
-__revision__ = 'g751b64b'
diff --git a/version.txt b/version.txt
index 40261ee..24c585f 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.0.6-0-g751b64b
\ No newline at end of file
+v0.0.7-0-g2857dcf
\ No newline at end of file