diff --git a/debian/changelog b/debian/changelog
index 8084e44..993babc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 swh-vault (0.0.1-1) unstable; urgency=low
 
   * Create swh-vault package
 
- -- Antoine Pietri <antoine.pietri@inria.fr> Fri, 05 May 2017 16:08:15
+ -- Antoine Pietri <antoine.pietri@inria.fr>  Fri, 05 May 2017 16:08:15 +0200
diff --git a/debian/control b/debian/control
index 1ffec31..61d83dc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,34 @@
 Source: swh-vault
 Maintainer: Software Heritage developers <swh-devel@inria.fr>
 Section: python
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python (>= 2),
                python3-all,
                python3-click,
                python3-dateutil,
                python3-dulwich,
                python3-fastimport,
                python3-flask,
                python3-nose,
                python3-psycopg2,
                python3-setuptools,
                python3-swh.core (>= 0.0.28~),
                python3-swh.model (>= 0.0.18~),
                python3-swh.objstorage (>= 0.0.17~),
                python3-swh.scheduler (>= 0.0.11~),
+               python3-swh.storage (>= 0.0.92~),
                python3-vcversioner
 Standards-Version: 3.9.6
 Homepage: https://forge.softwareheritage.org/diffusion/DVAU/
 
 Package: python3-swh.vault
 Architecture: all
 Depends: python3-swh.core (>= 0.0.28~),
          python3-swh.model (>= 0.0.18~),
          python3-swh.objstorage (>= 0.0.17~),
          python3-swh.scheduler (>= 0.0.11~),
+         python3-swh.storage (>= 0.0.92~),
          ${misc:Depends},
          ${python3:Depends}
 Description: Software Heritage <module-description>
diff --git a/requirements-swh.txt b/requirements-swh.txt
index e50a5f1..c0fca85 100644
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -1,4 +1,5 @@
 swh.core >= 0.0.28
 swh.model >= 0.0.18
 swh.objstorage >= 0.0.17
 swh.scheduler >= 0.0.11
+swh.storage >= 0.0.92
diff --git a/setup.py b/setup.py
index 3d811c6..cc1d061 100755
--- a/setup.py
+++ b/setup.py
@@ -1,34 +1,30 @@
 #!/usr/bin/env python3
 
 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.vault',
     description='Software Heritage vault',
     author='Software Heritage developers',
     author_email='swh-devel@inria.fr',
     url='https://forge.softwareheritage.org/diffusion/DVAU/',
-    packages=[
-        'swh.vault',
-        'swh.vault.api',
-        'swh.vault.cooker',
-    ],
+    packages=find_packages(),
     install_requires=parse_requirements(),
     setup_requires=['vcversioner'],
     vcversioner={},
     include_package_data=True,
     zip_safe=False,
 )
diff --git a/swh/vault/__init__.py b/swh/vault/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/swh/vault/api/__init__.py b/swh/vault/api/__init__.py
new file mode 100644
index 0000000..e69de29