diff --git a/swh/indexer/sql/10-superuser-init.sql b/swh/indexer/storage/sql/10-superuser-init.sql
similarity index 100%
rename from swh/indexer/sql/10-superuser-init.sql
rename to swh/indexer/storage/sql/10-superuser-init.sql
diff --git a/swh/indexer/sql/20-enums.sql b/swh/indexer/storage/sql/20-enums.sql
similarity index 100%
rename from swh/indexer/sql/20-enums.sql
rename to swh/indexer/storage/sql/20-enums.sql
diff --git a/swh/indexer/sql/30-schema.sql b/swh/indexer/storage/sql/30-schema.sql
similarity index 100%
rename from swh/indexer/sql/30-schema.sql
rename to swh/indexer/storage/sql/30-schema.sql
diff --git a/swh/indexer/sql/50-data.sql b/swh/indexer/storage/sql/50-data.sql
similarity index 100%
rename from swh/indexer/sql/50-data.sql
rename to swh/indexer/storage/sql/50-data.sql
diff --git a/swh/indexer/sql/50-func.sql b/swh/indexer/storage/sql/50-func.sql
similarity index 100%
rename from swh/indexer/sql/50-func.sql
rename to swh/indexer/storage/sql/50-func.sql
diff --git a/swh/indexer/sql/60-indexes.sql b/swh/indexer/storage/sql/60-indexes.sql
similarity index 100%
rename from swh/indexer/sql/60-indexes.sql
rename to swh/indexer/storage/sql/60-indexes.sql
diff --git a/swh/indexer/sql/upgrades/115.sql b/swh/indexer/storage/sql/upgrades/115.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/115.sql
rename to swh/indexer/storage/sql/upgrades/115.sql
diff --git a/swh/indexer/sql/upgrades/116.sql b/swh/indexer/storage/sql/upgrades/116.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/116.sql
rename to swh/indexer/storage/sql/upgrades/116.sql
diff --git a/swh/indexer/sql/upgrades/117.sql b/swh/indexer/storage/sql/upgrades/117.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/117.sql
rename to swh/indexer/storage/sql/upgrades/117.sql
diff --git a/swh/indexer/sql/upgrades/118.sql b/swh/indexer/storage/sql/upgrades/118.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/118.sql
rename to swh/indexer/storage/sql/upgrades/118.sql
diff --git a/swh/indexer/sql/upgrades/119.sql b/swh/indexer/storage/sql/upgrades/119.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/119.sql
rename to swh/indexer/storage/sql/upgrades/119.sql
diff --git a/swh/indexer/sql/upgrades/120.sql b/swh/indexer/storage/sql/upgrades/120.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/120.sql
rename to swh/indexer/storage/sql/upgrades/120.sql
diff --git a/swh/indexer/sql/upgrades/121.sql b/swh/indexer/storage/sql/upgrades/121.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/121.sql
rename to swh/indexer/storage/sql/upgrades/121.sql
diff --git a/swh/indexer/sql/upgrades/122.sql b/swh/indexer/storage/sql/upgrades/122.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/122.sql
rename to swh/indexer/storage/sql/upgrades/122.sql
diff --git a/swh/indexer/sql/upgrades/123.sql b/swh/indexer/storage/sql/upgrades/123.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/123.sql
rename to swh/indexer/storage/sql/upgrades/123.sql
diff --git a/swh/indexer/sql/upgrades/124.sql b/swh/indexer/storage/sql/upgrades/124.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/124.sql
rename to swh/indexer/storage/sql/upgrades/124.sql
diff --git a/swh/indexer/sql/upgrades/125.sql b/swh/indexer/storage/sql/upgrades/125.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/125.sql
rename to swh/indexer/storage/sql/upgrades/125.sql
diff --git a/swh/indexer/sql/upgrades/126.sql b/swh/indexer/storage/sql/upgrades/126.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/126.sql
rename to swh/indexer/storage/sql/upgrades/126.sql
diff --git a/swh/indexer/sql/upgrades/127.sql b/swh/indexer/storage/sql/upgrades/127.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/127.sql
rename to swh/indexer/storage/sql/upgrades/127.sql
diff --git a/swh/indexer/sql/upgrades/128.sql b/swh/indexer/storage/sql/upgrades/128.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/128.sql
rename to swh/indexer/storage/sql/upgrades/128.sql
diff --git a/swh/indexer/sql/upgrades/129.sql b/swh/indexer/storage/sql/upgrades/129.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/129.sql
rename to swh/indexer/storage/sql/upgrades/129.sql
diff --git a/swh/indexer/sql/upgrades/130.sql b/swh/indexer/storage/sql/upgrades/130.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/130.sql
rename to swh/indexer/storage/sql/upgrades/130.sql
diff --git a/swh/indexer/sql/upgrades/131.sql b/swh/indexer/storage/sql/upgrades/131.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/131.sql
rename to swh/indexer/storage/sql/upgrades/131.sql
diff --git a/swh/indexer/sql/upgrades/132.sql b/swh/indexer/storage/sql/upgrades/132.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/132.sql
rename to swh/indexer/storage/sql/upgrades/132.sql
diff --git a/swh/indexer/sql/upgrades/133.sql b/swh/indexer/storage/sql/upgrades/133.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/133.sql
rename to swh/indexer/storage/sql/upgrades/133.sql
diff --git a/swh/indexer/sql/upgrades/134.sql b/swh/indexer/storage/sql/upgrades/134.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/134.sql
rename to swh/indexer/storage/sql/upgrades/134.sql
diff --git a/swh/indexer/sql/upgrades/135.sql b/swh/indexer/storage/sql/upgrades/135.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/135.sql
rename to swh/indexer/storage/sql/upgrades/135.sql
diff --git a/swh/indexer/sql/upgrades/136.sql b/swh/indexer/storage/sql/upgrades/136.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/136.sql
rename to swh/indexer/storage/sql/upgrades/136.sql
diff --git a/swh/indexer/sql/upgrades/137.sql b/swh/indexer/storage/sql/upgrades/137.sql
similarity index 100%
rename from swh/indexer/sql/upgrades/137.sql
rename to swh/indexer/storage/sql/upgrades/137.sql
diff --git a/swh/indexer/tests/conftest.py b/swh/indexer/tests/conftest.py
index cd3d7a6e33378f6e460b0d27bd76e406d314bdb7..65b946086ba17670ed368e2c7cad3a2478f1af88 100644
--- a/swh/indexer/tests/conftest.py
+++ b/swh/indexer/tests/conftest.py
@@ -22,7 +22,7 @@ idx_postgresql_proc = factories.postgresql_proc(
     load=[
         partial(
             initialize_database_for_module,
-            modname="indexer",
+            modname="indexer.storage",
             version=IndexerStorage.current_version,
         )
     ],