diff --git a/swh/storage/objstorage/__init__.py b/swh/storage/objstorage/__init__.py
new file mode 100644
--- /dev/null
+++ b/swh/storage/objstorage/__init__.py
@@ -0,0 +1 @@
+from .objstorage import ObjStorage, DIR_MODE, FILE_MODE  # NOQA
diff --git a/swh/storage/objstorage.py b/swh/storage/objstorage/objstorage.py
rename from swh/storage/objstorage.py
rename to swh/storage/objstorage/objstorage.py
--- a/swh/storage/objstorage.py
+++ b/swh/storage/objstorage/objstorage.py
@@ -10,7 +10,7 @@
 
 from contextlib import contextmanager
 
-from .exc import ObjNotFoundError, Error
+from ..exc import ObjNotFoundError, Error
 from swh.core import hashutil