diff --git a/swh/foo/bar.py b/swh/foo/bar.py
deleted file mode 100644
index ea8590d..0000000
--- a/swh/foo/bar.py
+++ /dev/null
@@ -1,4 +0,0 @@
-# Copyright (C) 2015  The Software Heritage developers
-# See the AUTHORS file at the top-level directory of this distribution
-# License: GNU General Public License version 3, or any later version
-# See top-level LICENSE file for more information
diff --git a/__init__.py b/swh/objstorage/__init__.py
similarity index 100%
rename from __init__.py
rename to swh/objstorage/__init__.py
diff --git a/api/__init__.py b/swh/objstorage/api/__init__.py
similarity index 100%
rename from api/__init__.py
rename to swh/objstorage/api/__init__.py
diff --git a/api/client.py b/swh/objstorage/api/client.py
similarity index 100%
rename from api/client.py
rename to swh/objstorage/api/client.py
diff --git a/api/server.py b/swh/objstorage/api/server.py
similarity index 100%
rename from api/server.py
rename to swh/objstorage/api/server.py
diff --git a/multiplexer/__init__.py b/swh/objstorage/multiplexer/__init__.py
similarity index 100%
rename from multiplexer/__init__.py
rename to swh/objstorage/multiplexer/__init__.py
diff --git a/multiplexer/filter/__init__.py b/swh/objstorage/multiplexer/filter/__init__.py
similarity index 100%
rename from multiplexer/filter/__init__.py
rename to swh/objstorage/multiplexer/filter/__init__.py
diff --git a/multiplexer/filter/filter.py b/swh/objstorage/multiplexer/filter/filter.py
similarity index 100%
rename from multiplexer/filter/filter.py
rename to swh/objstorage/multiplexer/filter/filter.py
diff --git a/multiplexer/filter/id_filter.py b/swh/objstorage/multiplexer/filter/id_filter.py
similarity index 100%
rename from multiplexer/filter/id_filter.py
rename to swh/objstorage/multiplexer/filter/id_filter.py
diff --git a/multiplexer/filter/read_write_filter.py b/swh/objstorage/multiplexer/filter/read_write_filter.py
similarity index 100%
rename from multiplexer/filter/read_write_filter.py
rename to swh/objstorage/multiplexer/filter/read_write_filter.py
diff --git a/multiplexer/multiplexer_objstorage.py b/swh/objstorage/multiplexer/multiplexer_objstorage.py
similarity index 100%
rename from multiplexer/multiplexer_objstorage.py
rename to swh/objstorage/multiplexer/multiplexer_objstorage.py
diff --git a/objstorage.py b/swh/objstorage/objstorage.py
similarity index 100%
rename from objstorage.py
rename to swh/objstorage/objstorage.py
diff --git a/objstorage_pathslicing.py b/swh/objstorage/objstorage_pathslicing.py
similarity index 100%
rename from objstorage_pathslicing.py
rename to swh/objstorage/objstorage_pathslicing.py