diff --git a/debian/changelog b/debian/changelog
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@
 
   * 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
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@
                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/
@@ -27,6 +28,7 @@
          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>
+Description: Software Heritage Vault
diff --git a/requirements-swh.txt b/requirements-swh.txt
--- a/requirements-swh.txt
+++ b/requirements-swh.txt
@@ -2,3 +2,4 @@
 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
--- a/setup.py
+++ b/setup.py
@@ -21,11 +21,7 @@
     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={},
diff --git a/swh/vault/__init__.py b/swh/vault/__init__.py
new file mode 100644
diff --git a/swh/vault/api/__init__.py b/swh/vault/api/__init__.py
new file mode 100644