diff --git a/PKG-INFO b/PKG-INFO
index 01d808da..6363b756 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: swh.storage
-Version: 0.0.21
+Version: 0.0.22
 Summary: Software Heritage storage manager
 Home-page: https://forge.softwareheritage.org/diffusion/DSTO/
 Author: Software Heritage developers
 Author-email: swh-devel@inria.fr
 License: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
diff --git a/swh.storage.egg-info/PKG-INFO b/swh.storage.egg-info/PKG-INFO
index 01d808da..6363b756 100644
--- a/swh.storage.egg-info/PKG-INFO
+++ b/swh.storage.egg-info/PKG-INFO
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: swh.storage
-Version: 0.0.21
+Version: 0.0.22
 Summary: Software Heritage storage manager
 Home-page: https://forge.softwareheritage.org/diffusion/DSTO/
 Author: Software Heritage developers
 Author-email: swh-devel@inria.fr
 License: UNKNOWN
 Description: UNKNOWN
 Platform: UNKNOWN
diff --git a/swh/storage/__init__.py b/swh/storage/__init__.py
index 3582630c..ce296b4b 100644
--- a/swh/storage/__init__.py
+++ b/swh/storage/__init__.py
@@ -1,27 +1,27 @@
 from . import storage
 
 Storage = storage.Storage
 
 
 def get_storage(storage_class, storage_args):
     """
     Get a storage object of class `storage_class` with arguments
     `storage_args`.
 
     Args:
         storage_class: one of 'remote_storage', 'local_storage'
         storage_args: the arguments to pass to the storage class
     Returns:
         an instance of swh.storage.Storage (either local or remote)
     Raises:
         ValueError if passed an unknown storage_class.
     """
 
     if storage_class == 'remote_storage':
-        from .storage.api.client import RemoteStorage as Storage
+        from .api.client import RemoteStorage as Storage
     elif storage_class == 'local_storage':
         from .storage import Storage
     else:
         raise ValueError('Unknown storage class `%s`' % storage_class)
 
     return Storage(*storage_args)
diff --git a/version.txt b/version.txt
index f37854f0..3a5d1d7c 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-v0.0.21-0-g1938416
\ No newline at end of file
+v0.0.22-0-g14276dc
\ No newline at end of file