From 25f43faa70f7cc58493b636c2702ae63395779dc Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>
Date: Fri, 7 May 2021 10:22:05 +0100
Subject: [PATCH] Reorganise the database schema directories (#9932)

The hope here is that by moving all the schema files into synapse/storage/schema, it gets a bit easier for newcomers to navigate.

It certainly got easier for me to write a helpful README. There's more to do on that front, but I'll follow up with other PRs for that.
---
 changelog.d/9932.misc                         |  1 +
 .../main/schema/full_schemas/README.md        | 21 --------
 synapse/storage/prepare_database.py           | 48 ++++++++++---------
 synapse/storage/schema/README.md              | 37 ++++++++++++++
 synapse/storage/schema/__init__.py            | 17 +++++++
 .../delta/25/00background_updates.sql         |  0
 .../delta/35/00background_updates_add_col.sql |  0
 .../delta/58/00background_update_ordering.sql |  0
 .../{ => common}/full_schemas/54/full.sql     |  0
 .../schema/{ => common}/schema_version.sql    |  0
 .../schema => schema/main}/delta/12/v12.sql   |  0
 .../schema => schema/main}/delta/13/v13.sql   |  0
 .../schema => schema/main}/delta/14/v14.sql   |  0
 .../main}/delta/15/appservice_txns.sql        |  0
 .../main}/delta/15/presence_indices.sql       |  0
 .../schema => schema/main}/delta/15/v15.sql   |  0
 .../main}/delta/16/events_order_index.sql     |  0
 .../delta/16/remote_media_cache_index.sql     |  0
 .../main}/delta/16/remove_duplicates.sql      |  0
 .../main}/delta/16/room_alias_index.sql       |  0
 .../main}/delta/16/unique_constraints.sql     |  0
 .../schema => schema/main}/delta/16/users.sql |  0
 .../main}/delta/17/drop_indexes.sql           |  0
 .../main}/delta/17/server_keys.sql            |  0
 .../main}/delta/17/user_threepids.sql         |  0
 .../delta/18/server_keys_bigger_ints.sql      |  0
 .../main}/delta/19/event_index.sql            |  0
 .../schema => schema/main}/delta/20/dummy.sql |  0
 .../main}/delta/20/pushers.py                 |  0
 .../main}/delta/21/end_to_end_keys.sql        |  0
 .../main}/delta/21/receipts.sql               |  0
 .../main}/delta/22/receipts_index.sql         |  0
 .../main}/delta/22/user_threepids_unique.sql  |  0
 .../main}/delta/24/stats_reporting.sql        |  0
 .../schema => schema/main}/delta/25/fts.py    |  0
 .../main}/delta/25/guest_access.sql           |  0
 .../main}/delta/25/history_visibility.sql     |  0
 .../schema => schema/main}/delta/25/tags.sql  |  0
 .../main}/delta/26/account_data.sql           |  0
 .../main}/delta/27/account_data.sql           |  0
 .../main}/delta/27/forgotten_memberships.sql  |  0
 .../schema => schema/main}/delta/27/ts.py     |  0
 .../main}/delta/28/event_push_actions.sql     |  0
 .../main}/delta/28/events_room_stream.sql     |  0
 .../main}/delta/28/public_roms_index.sql      |  0
 .../main}/delta/28/receipts_user_id_index.sql |  0
 .../main}/delta/28/upgrade_times.sql          |  0
 .../main}/delta/28/users_is_guest.sql         |  0
 .../main}/delta/29/push_actions.sql           |  0
 .../main}/delta/30/alias_creator.sql          |  0
 .../main}/delta/30/as_users.py                |  0
 .../main}/delta/30/deleted_pushers.sql        |  0
 .../main}/delta/30/presence_stream.sql        |  0
 .../main}/delta/30/public_rooms.sql           |  0
 .../main}/delta/30/push_rule_stream.sql       |  0
 .../delta/30/threepid_guest_access_tokens.sql |  0
 .../main}/delta/31/invites.sql                |  0
 .../31/local_media_repository_url_cache.sql   |  0
 .../main}/delta/31/pushers.py                 |  0
 .../main}/delta/31/pushers_index.sql          |  0
 .../main}/delta/31/search_update.py           |  0
 .../main}/delta/32/events.sql                 |  0
 .../main}/delta/32/openid.sql                 |  0
 .../main}/delta/32/pusher_throttle.sql        |  0
 .../main}/delta/32/remove_indices.sql         |  0
 .../main}/delta/32/reports.sql                |  0
 .../delta/33/access_tokens_device_index.sql   |  0
 .../main}/delta/33/devices.sql                |  0
 .../main}/delta/33/devices_for_e2e_keys.sql   |  0
 ...ices_for_e2e_keys_clear_unknown_device.sql |  0
 .../main}/delta/33/event_fields.py            |  0
 .../main}/delta/33/remote_media_ts.py         |  0
 .../main}/delta/33/user_ips_index.sql         |  0
 .../main}/delta/34/appservice_stream.sql      |  0
 .../main}/delta/34/cache_stream.py            |  0
 .../main}/delta/34/device_inbox.sql           |  0
 .../delta/34/push_display_name_rename.sql     |  0
 .../main}/delta/34/received_txn_purge.py      |  0
 .../main}/delta/35/contains_url.sql           |  0
 .../main}/delta/35/device_outbox.sql          |  0
 .../main}/delta/35/device_stream_id.sql       |  0
 .../delta/35/event_push_actions_index.sql     |  0
 .../35/public_room_list_change_stream.sql     |  0
 .../main}/delta/35/stream_order_to_extrem.sql |  0
 .../main}/delta/36/readd_public_rooms.sql     |  0
 .../main}/delta/37/remove_auth_idx.py         |  0
 .../main}/delta/37/user_threepids.sql         |  0
 .../main}/delta/38/postgres_fts_gist.sql      |  0
 .../main}/delta/39/appservice_room_list.sql   |  0
 .../delta/39/device_federation_stream_idx.sql |  0
 .../main}/delta/39/event_push_index.sql       |  0
 .../delta/39/federation_out_position.sql      |  0
 .../main}/delta/39/membership_profile.sql     |  0
 .../main}/delta/40/current_state_idx.sql      |  0
 .../main}/delta/40/device_inbox.sql           |  0
 .../main}/delta/40/device_list_streams.sql    |  0
 .../main}/delta/40/event_push_summary.sql     |  0
 .../main}/delta/40/pushers.sql                |  0
 .../main}/delta/41/device_list_stream_idx.sql |  0
 .../main}/delta/41/device_outbound_index.sql  |  0
 .../delta/41/event_search_event_id_idx.sql    |  0
 .../main}/delta/41/ratelimit.sql              |  0
 .../main}/delta/42/current_state_delta.sql    |  0
 .../main}/delta/42/device_list_last_id.sql    |  0
 .../main}/delta/42/event_auth_state_only.sql  |  0
 .../main}/delta/42/user_dir.py                |  0
 .../main}/delta/43/blocked_rooms.sql          |  0
 .../main}/delta/43/quarantine_media.sql       |  0
 .../main}/delta/43/url_cache.sql              |  0
 .../main}/delta/43/user_share.sql             |  0
 .../main}/delta/44/expire_url_cache.sql       |  0
 .../main}/delta/45/group_server.sql           |  0
 .../main}/delta/45/profile_cache.sql          |  0
 .../main}/delta/46/drop_refresh_tokens.sql    |  0
 .../delta/46/drop_unique_deleted_pushers.sql  |  0
 .../main}/delta/46/group_server.sql           |  0
 .../46/local_media_repository_url_idx.sql     |  0
 .../main}/delta/46/user_dir_null_room_ids.sql |  0
 .../main}/delta/46/user_dir_typos.sql         |  0
 .../main}/delta/47/last_access_media.sql      |  0
 .../main}/delta/47/postgres_fts_gin.sql       |  0
 .../main}/delta/47/push_actions_staging.sql   |  0
 .../main}/delta/48/add_user_consent.sql       |  0
 .../delta/48/add_user_ips_last_seen_index.sql |  0
 .../main}/delta/48/deactivated_users.sql      |  0
 .../main}/delta/48/group_unique_indexes.py    |  0
 .../main}/delta/48/groups_joinable.sql        |  0
 .../add_user_consent_server_notice_sent.sql   |  0
 .../main}/delta/49/add_user_daily_visits.sql  |  0
 .../49/add_user_ips_last_seen_only_index.sql  |  0
 .../delta/50/add_creation_ts_users_index.sql  |  0
 .../main}/delta/50/erasure_store.sql          |  0
 .../delta/50/make_event_content_nullable.py   |  0
 .../main}/delta/51/e2e_room_keys.sql          |  0
 .../main}/delta/51/monthly_active_users.sql   |  0
 .../52/add_event_to_state_group_index.sql     |  0
 .../52/device_list_streams_unique_idx.sql     |  0
 .../main}/delta/52/e2e_room_keys.sql          |  0
 .../main}/delta/53/add_user_type_to_users.sql |  0
 .../main}/delta/53/drop_sent_transactions.sql |  0
 .../main}/delta/53/event_format_version.sql   |  0
 .../main}/delta/53/user_dir_populate.sql      |  0
 .../main}/delta/53/user_ips_index.sql         |  0
 .../main}/delta/53/user_share.sql             |  0
 .../main}/delta/53/user_threepid_id.sql       |  0
 .../main}/delta/53/users_in_public_rooms.sql  |  0
 .../54/account_validity_with_renewal.sql      |  0
 .../delta/54/add_validity_to_server_keys.sql  |  0
 .../delta/54/delete_forward_extremities.sql   |  0
 .../main}/delta/54/drop_legacy_tables.sql     |  0
 .../main}/delta/54/drop_presence_list.sql     |  0
 .../main}/delta/54/relations.sql              |  0
 .../schema => schema/main}/delta/54/stats.sql |  0
 .../main}/delta/54/stats2.sql                 |  0
 .../main}/delta/55/access_token_expiry.sql    |  0
 .../delta/55/track_threepid_validations.sql   |  0
 .../delta/55/users_alter_deactivated.sql      |  0
 .../delta/56/add_spans_to_device_lists.sql    |  0
 .../56/current_state_events_membership.sql    |  0
 .../current_state_events_membership_mk2.sql   |  0
 .../56/delete_keys_from_deleted_backups.sql   |  0
 .../delta/56/destinations_failure_ts.sql      |  0
 ...tinations_retry_interval_type.sql.postgres |  0
 .../delta/56/device_stream_id_insert.sql      |  0
 .../main}/delta/56/devices_last_seen.sql      |  0
 .../delta/56/drop_unused_event_tables.sql     |  0
 .../main}/delta/56/event_expiry.sql           |  0
 .../main}/delta/56/event_labels.sql           |  0
 .../56/event_labels_background_update.sql     |  0
 .../main}/delta/56/fix_room_keys_index.sql    |  0
 .../main}/delta/56/hidden_devices.sql         |  0
 .../delta/56/hidden_devices_fix.sql.sqlite    |  0
 .../56/nuke_empty_communities_from_db.sql     |  0
 .../main}/delta/56/public_room_list_idx.sql   |  0
 .../main}/delta/56/redaction_censor.sql       |  0
 .../main}/delta/56/redaction_censor2.sql      |  0
 .../redaction_censor3_fix_update.sql.postgres |  0
 .../main}/delta/56/redaction_censor4.sql      |  0
 ...remove_tombstoned_rooms_from_directory.sql |  0
 .../main}/delta/56/room_key_etag.sql          |  0
 .../main}/delta/56/room_membership_idx.sql    |  0
 .../main}/delta/56/room_retention.sql         |  0
 .../main}/delta/56/signing_keys.sql           |  0
 .../56/signing_keys_nonunique_signatures.sql  |  0
 .../main}/delta/56/stats_separated.sql        |  0
 .../delta/56/unique_user_filter_index.py      |  0
 .../main}/delta/56/user_external_ids.sql      |  0
 .../delta/56/users_in_public_rooms_idx.sql    |  0
 .../57/delete_old_current_state_events.sql    |  0
 .../57/device_list_remote_cache_stale.sql     |  0
 .../delta/57/local_current_membership.py      |  0
 .../delta/57/remove_sent_outbound_pokes.sql   |  0
 .../main}/delta/57/rooms_version_column.sql   |  0
 .../57/rooms_version_column_2.sql.postgres    |  0
 .../57/rooms_version_column_2.sql.sqlite      |  0
 .../57/rooms_version_column_3.sql.postgres    |  0
 .../57/rooms_version_column_3.sql.sqlite      |  0
 .../delta/58/02remove_dup_outbound_pokes.sql  |  0
 .../main}/delta/58/03persist_ui_auth.sql      |  0
 .../delta/58/05cache_instance.sql.postgres    |  0
 .../main}/delta/58/06dlols_unique_idx.py      |  0
 ...ethod_to_thumbnail_constraint.sql.postgres |  0
 ..._method_to_thumbnail_constraint.sql.sqlite |  0
 .../main}/delta/58/07persist_ui_auth_ips.sql  |  0
 ...08_media_safe_from_quarantine.sql.postgres |  0
 .../08_media_safe_from_quarantine.sql.sqlite  |  0
 .../main}/delta/58/09shadow_ban.sql           |  0
 .../10_pushrules_enabled_delete_obsolete.sql  |  0
 .../58/10drop_local_rejections_stream.sql     |  0
 .../58/10federation_pos_instance_name.sql     |  0
 .../main}/delta/58/11dehydration.sql          |  0
 .../main}/delta/58/11fallback.sql             |  0
 .../main}/delta/58/11user_id_seq.py           |  0
 .../main}/delta/58/12room_stats.sql           |  0
 .../58/13remove_presence_allow_inbound.sql    |  0
 .../main}/delta/58/14events_instance_name.sql |  0
 .../58/14events_instance_name.sql.postgres    |  0
 .../delta/58/15_catchup_destination_rooms.sql |  0
 .../main}/delta/58/15unread_count.sql         |  0
 .../58/16populate_stats_process_rooms_fix.sql |  0
 .../delta/58/17_catchup_last_successful.sql   |  0
 .../main}/delta/58/18stream_positions.sql     |  0
 .../delta/58/19instance_map.sql.postgres      |  0
 .../main}/delta/58/19txn_id.sql               |  0
 .../delta/58/20instance_name_event_tables.sql |  0
 .../main}/delta/58/20user_daily_visits.sql    |  0
 .../main}/delta/58/21as_device_stream.sql     |  0
 .../delta/58/21drop_device_max_stream_id.sql  |  0
 .../main}/delta/58/22puppet_token.sql         |  0
 .../delta/58/22users_have_local_media.sql     |  0
 .../delta/58/23e2e_cross_signing_keys_idx.sql |  0
 .../delta/58/24drop_event_json_index.sql      |  0
 .../58/25user_external_ids_user_id_idx.sql    |  0
 .../58/26access_token_last_validated.sql      |  0
 .../main}/delta/58/27local_invites.sql        |  0
 .../58/28drop_last_used_column.sql.postgres   |  0
 .../58/28drop_last_used_column.sql.sqlite     |  0
 .../main}/delta/59/01ignored_user.py          |  0
 .../main}/delta/59/02shard_send_to_device.sql |  0
 ...shard_send_to_device_sequence.sql.postgres |  0
 .../main}/delta/59/04_event_auth_chains.sql   |  0
 .../59/04_event_auth_chains.sql.postgres      |  0
 .../main}/delta/59/04drop_account_data.sql    |  0
 .../main}/delta/59/05cache_invalidation.sql   |  0
 .../main}/delta/59/06chain_cover_index.sql    |  0
 .../main}/delta/59/06shard_account_data.sql   |  0
 .../59/06shard_account_data.sql.postgres      |  0
 .../delta/59/07shard_account_data_fix.sql     |  0
 ...elete_pushers_for_deactivated_accounts.sql |  0
 .../main}/delta/59/08delete_stale_pushers.sql |  0
 .../delta/59/09rejected_events_metadata.sql   |  0
 .../delta/59/10delete_purged_chain_cover.sql  |  0
 .../11drop_thumbnail_constraint.sql.postgres  |  0
 .../12account_validity_token_used_ts_ms.sql   |  0
 .../delta/59/12presence_stream_instance.sql   |  0
 ...2presence_stream_instance_seq.sql.postgres |  0
 .../full_schemas/16/application_services.sql  |  0
 .../main}/full_schemas/16/event_edges.sql     |  0
 .../full_schemas/16/event_signatures.sql      |  0
 .../main}/full_schemas/16/im.sql              |  0
 .../main}/full_schemas/16/keys.sql            |  0
 .../full_schemas/16/media_repository.sql      |  0
 .../main}/full_schemas/16/presence.sql        |  0
 .../main}/full_schemas/16/profiles.sql        |  0
 .../main}/full_schemas/16/push.sql            |  0
 .../main}/full_schemas/16/redactions.sql      |  0
 .../main}/full_schemas/16/room_aliases.sql    |  0
 .../main}/full_schemas/16/state.sql           |  0
 .../main}/full_schemas/16/transactions.sql    |  0
 .../main}/full_schemas/16/users.sql           |  0
 .../main}/full_schemas/54/full.sql.postgres   |  0
 .../main}/full_schemas/54/full.sql.sqlite     |  0
 .../full_schemas/54/stream_positions.sql      |  0
 .../state}/delta/23/drop_state_index.sql      |  0
 .../state}/delta/30/state_stream.sql          |  0
 .../state}/delta/32/remove_state_indices.sql  |  0
 .../state}/delta/35/add_state_index.sql       |  0
 .../state}/delta/35/state.sql                 |  0
 .../state}/delta/35/state_dedupe.sql          |  0
 .../state}/delta/47/state_group_seq.py        |  0
 .../state}/delta/56/state_group_room_idx.sql  |  0
 .../state}/full_schemas/54/full.sql           |  0
 .../full_schemas/54/sequence.sql.postgres     |  0
 tests/storage/test_cleanup_extrems.py         |  4 +-
 284 files changed, 81 insertions(+), 47 deletions(-)
 create mode 100644 changelog.d/9932.misc
 delete mode 100644 synapse/storage/databases/main/schema/full_schemas/README.md
 create mode 100644 synapse/storage/schema/README.md
 create mode 100644 synapse/storage/schema/__init__.py
 rename synapse/storage/schema/{ => common}/delta/25/00background_updates.sql (100%)
 rename synapse/storage/schema/{ => common}/delta/35/00background_updates_add_col.sql (100%)
 rename synapse/storage/schema/{ => common}/delta/58/00background_update_ordering.sql (100%)
 rename synapse/storage/schema/{ => common}/full_schemas/54/full.sql (100%)
 rename synapse/storage/schema/{ => common}/schema_version.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/12/v12.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/13/v13.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/14/v14.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/15/appservice_txns.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/15/presence_indices.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/15/v15.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/16/events_order_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/16/remote_media_cache_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/16/remove_duplicates.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/16/room_alias_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/16/unique_constraints.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/16/users.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/17/drop_indexes.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/17/server_keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/17/user_threepids.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/18/server_keys_bigger_ints.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/19/event_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/20/dummy.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/20/pushers.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/21/end_to_end_keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/21/receipts.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/22/receipts_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/22/user_threepids_unique.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/24/stats_reporting.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/25/fts.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/25/guest_access.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/25/history_visibility.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/25/tags.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/26/account_data.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/27/account_data.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/27/forgotten_memberships.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/27/ts.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/28/event_push_actions.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/28/events_room_stream.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/28/public_roms_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/28/receipts_user_id_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/28/upgrade_times.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/28/users_is_guest.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/29/push_actions.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/30/alias_creator.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/30/as_users.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/30/deleted_pushers.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/30/presence_stream.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/30/public_rooms.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/30/push_rule_stream.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/30/threepid_guest_access_tokens.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/31/invites.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/31/local_media_repository_url_cache.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/31/pushers.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/31/pushers_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/31/search_update.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/32/events.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/32/openid.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/32/pusher_throttle.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/32/remove_indices.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/32/reports.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/33/access_tokens_device_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/33/devices.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/33/devices_for_e2e_keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/33/devices_for_e2e_keys_clear_unknown_device.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/33/event_fields.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/33/remote_media_ts.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/33/user_ips_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/34/appservice_stream.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/34/cache_stream.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/34/device_inbox.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/34/push_display_name_rename.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/34/received_txn_purge.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/35/contains_url.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/35/device_outbox.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/35/device_stream_id.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/35/event_push_actions_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/35/public_room_list_change_stream.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/35/stream_order_to_extrem.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/36/readd_public_rooms.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/37/remove_auth_idx.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/37/user_threepids.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/38/postgres_fts_gist.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/39/appservice_room_list.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/39/device_federation_stream_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/39/event_push_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/39/federation_out_position.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/39/membership_profile.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/40/current_state_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/40/device_inbox.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/40/device_list_streams.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/40/event_push_summary.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/40/pushers.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/41/device_list_stream_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/41/device_outbound_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/41/event_search_event_id_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/41/ratelimit.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/42/current_state_delta.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/42/device_list_last_id.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/42/event_auth_state_only.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/42/user_dir.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/43/blocked_rooms.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/43/quarantine_media.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/43/url_cache.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/43/user_share.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/44/expire_url_cache.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/45/group_server.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/45/profile_cache.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/46/drop_refresh_tokens.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/46/drop_unique_deleted_pushers.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/46/group_server.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/46/local_media_repository_url_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/46/user_dir_null_room_ids.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/46/user_dir_typos.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/47/last_access_media.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/47/postgres_fts_gin.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/47/push_actions_staging.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/48/add_user_consent.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/48/add_user_ips_last_seen_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/48/deactivated_users.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/48/group_unique_indexes.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/48/groups_joinable.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/49/add_user_consent_server_notice_sent.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/49/add_user_daily_visits.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/49/add_user_ips_last_seen_only_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/50/add_creation_ts_users_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/50/erasure_store.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/50/make_event_content_nullable.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/51/e2e_room_keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/51/monthly_active_users.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/52/add_event_to_state_group_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/52/device_list_streams_unique_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/52/e2e_room_keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/add_user_type_to_users.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/drop_sent_transactions.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/event_format_version.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/user_dir_populate.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/user_ips_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/user_share.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/user_threepid_id.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/53/users_in_public_rooms.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/account_validity_with_renewal.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/add_validity_to_server_keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/delete_forward_extremities.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/drop_legacy_tables.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/drop_presence_list.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/relations.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/stats.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/54/stats2.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/55/access_token_expiry.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/55/track_threepid_validations.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/55/users_alter_deactivated.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/add_spans_to_device_lists.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/current_state_events_membership.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/current_state_events_membership_mk2.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/delete_keys_from_deleted_backups.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/destinations_failure_ts.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/destinations_retry_interval_type.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/device_stream_id_insert.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/devices_last_seen.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/drop_unused_event_tables.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/event_expiry.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/event_labels.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/event_labels_background_update.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/fix_room_keys_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/hidden_devices.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/hidden_devices_fix.sql.sqlite (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/nuke_empty_communities_from_db.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/public_room_list_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/redaction_censor.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/redaction_censor2.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/redaction_censor3_fix_update.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/redaction_censor4.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/remove_tombstoned_rooms_from_directory.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/room_key_etag.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/room_membership_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/room_retention.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/signing_keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/signing_keys_nonunique_signatures.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/stats_separated.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/unique_user_filter_index.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/user_external_ids.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/56/users_in_public_rooms_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/delete_old_current_state_events.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/device_list_remote_cache_stale.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/local_current_membership.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/remove_sent_outbound_pokes.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/rooms_version_column.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/rooms_version_column_2.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/rooms_version_column_2.sql.sqlite (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/rooms_version_column_3.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/57/rooms_version_column_3.sql.sqlite (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/02remove_dup_outbound_pokes.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/03persist_ui_auth.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/05cache_instance.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/06dlols_unique_idx.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/07add_method_to_thumbnail_constraint.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/07add_method_to_thumbnail_constraint.sql.sqlite (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/07persist_ui_auth_ips.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/08_media_safe_from_quarantine.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/08_media_safe_from_quarantine.sql.sqlite (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/09shadow_ban.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/10_pushrules_enabled_delete_obsolete.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/10drop_local_rejections_stream.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/10federation_pos_instance_name.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/11dehydration.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/11fallback.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/11user_id_seq.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/12room_stats.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/13remove_presence_allow_inbound.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/14events_instance_name.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/14events_instance_name.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/15_catchup_destination_rooms.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/15unread_count.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/16populate_stats_process_rooms_fix.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/17_catchup_last_successful.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/18stream_positions.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/19instance_map.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/19txn_id.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/20instance_name_event_tables.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/20user_daily_visits.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/21as_device_stream.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/21drop_device_max_stream_id.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/22puppet_token.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/22users_have_local_media.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/23e2e_cross_signing_keys_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/24drop_event_json_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/25user_external_ids_user_id_idx.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/26access_token_last_validated.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/27local_invites.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/28drop_last_used_column.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/58/28drop_last_used_column.sql.sqlite (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/01ignored_user.py (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/02shard_send_to_device.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/03shard_send_to_device_sequence.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/04_event_auth_chains.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/04_event_auth_chains.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/04drop_account_data.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/05cache_invalidation.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/06chain_cover_index.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/06shard_account_data.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/06shard_account_data.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/07shard_account_data_fix.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/08delete_pushers_for_deactivated_accounts.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/08delete_stale_pushers.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/09rejected_events_metadata.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/10delete_purged_chain_cover.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/11drop_thumbnail_constraint.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/12account_validity_token_used_ts_ms.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/12presence_stream_instance.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/delta/59/12presence_stream_instance_seq.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/application_services.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/event_edges.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/event_signatures.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/im.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/keys.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/media_repository.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/presence.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/profiles.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/push.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/redactions.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/room_aliases.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/state.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/transactions.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/16/users.sql (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/54/full.sql.postgres (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/54/full.sql.sqlite (100%)
 rename synapse/storage/{databases/main/schema => schema/main}/full_schemas/54/stream_positions.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/23/drop_state_index.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/30/state_stream.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/32/remove_state_indices.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/35/add_state_index.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/35/state.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/35/state_dedupe.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/47/state_group_seq.py (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/delta/56/state_group_room_idx.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/full_schemas/54/full.sql (100%)
 rename synapse/storage/{databases/state/schema => schema/state}/full_schemas/54/sequence.sql.postgres (100%)

diff --git a/changelog.d/9932.misc b/changelog.d/9932.misc
new file mode 100644
index 0000000000..9e16a36173
--- /dev/null
+++ b/changelog.d/9932.misc
@@ -0,0 +1 @@
+Move database schema files into a common directory.
diff --git a/synapse/storage/databases/main/schema/full_schemas/README.md b/synapse/storage/databases/main/schema/full_schemas/README.md
deleted file mode 100644
index c00f287190..0000000000
--- a/synapse/storage/databases/main/schema/full_schemas/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Synapse Database Schemas
-
-These schemas are used as a basis to create brand new Synapse databases, on both
-SQLite3 and Postgres.
-
-## Building full schema dumps
-
-If you want to recreate these schemas, they need to be made from a database that
-has had all background updates run.
-
-To do so, use `scripts-dev/make_full_schema.sh`. This will produce new
-`full.sql.postgres ` and `full.sql.sqlite` files. 
-
-Ensure postgres is installed and your user has the ability to run bash commands
-such as `createdb`, then call
-
-    ./scripts-dev/make_full_schema.sh -p postgres_username -o output_dir/
-
-There are currently two folders with full-schema snapshots. `16` is a snapshot
-from 2015, for historical reference. The other contains the most recent full
-schema snapshot.
diff --git a/synapse/storage/prepare_database.py b/synapse/storage/prepare_database.py
index 7a2cbee426..3799d46734 100644
--- a/synapse/storage/prepare_database.py
+++ b/synapse/storage/prepare_database.py
@@ -26,16 +26,13 @@ from synapse.config.homeserver import HomeServerConfig
 from synapse.storage.database import LoggingDatabaseConnection
 from synapse.storage.engines import BaseDatabaseEngine
 from synapse.storage.engines.postgres import PostgresEngine
+from synapse.storage.schema import SCHEMA_VERSION
 from synapse.storage.types import Cursor
 
 logger = logging.getLogger(__name__)
 
 
-# Remember to update this number every time a change is made to database
-# schema files, so the users will be informed on server restarts.
-SCHEMA_VERSION = 59
-
-dir_path = os.path.abspath(os.path.dirname(__file__))
+schema_path = os.path.join(os.path.abspath(os.path.dirname(__file__)), "schema")
 
 
 class PrepareDatabaseException(Exception):
@@ -167,7 +164,14 @@ def _setup_new_database(
 
     Example directory structure:
 
-        schema/
+    schema/
+        common/
+            delta/
+                ...
+            full_schemas/
+                11/
+                    foo.sql
+        main/
             delta/
                 ...
             full_schemas/
@@ -175,15 +179,14 @@ def _setup_new_database(
                     test.sql
                     ...
                 11/
-                    foo.sql
                     bar.sql
                 ...
 
     In the example foo.sql and bar.sql would be run, and then any delta files
     for versions strictly greater than 11.
 
-    Note: we apply the full schemas and deltas from the top level `schema/`
-    folder as well those in the data stores specified.
+    Note: we apply the full schemas and deltas from the `schema/common`
+    folder as well those in the databases specified.
 
     Args:
         cur: a database cursor
@@ -195,12 +198,12 @@ def _setup_new_database(
     # configured to our liking.
     database_engine.check_new_database(cur)
 
-    current_dir = os.path.join(dir_path, "schema", "full_schemas")
+    full_schemas_dir = os.path.join(schema_path, "common", "full_schemas")
 
     # First we find the highest full schema version we have
     valid_versions = []
 
-    for filename in os.listdir(current_dir):
+    for filename in os.listdir(full_schemas_dir):
         try:
             ver = int(filename)
         except ValueError:
@@ -218,15 +221,13 @@ def _setup_new_database(
 
     logger.debug("Initialising schema v%d", max_current_ver)
 
-    # Now lets find all the full schema files, both in the global schema and
-    # in data store schemas.
-    directories = [os.path.join(current_dir, str(max_current_ver))]
+    # Now let's find all the full schema files, both in the common schema and
+    # in database schemas.
+    directories = [os.path.join(full_schemas_dir, str(max_current_ver))]
     directories.extend(
         os.path.join(
-            dir_path,
-            "databases",
+            schema_path,
             database,
-            "schema",
             "full_schemas",
             str(max_current_ver),
         )
@@ -357,6 +358,9 @@ def _upgrade_existing_database(
         check_database_before_upgrade(cur, database_engine, config)
 
     start_ver = current_version
+
+    # if we got to this schema version by running a full_schema rather than a series
+    # of deltas, we should not run the deltas for this version.
     if not upgraded:
         start_ver += 1
 
@@ -385,12 +389,10 @@ def _upgrade_existing_database(
         # directories for schema updates.
 
         # First we find the directories to search in
-        delta_dir = os.path.join(dir_path, "schema", "delta", str(v))
+        delta_dir = os.path.join(schema_path, "common", "delta", str(v))
         directories = [delta_dir]
         for database in databases:
-            directories.append(
-                os.path.join(dir_path, "databases", database, "schema", "delta", str(v))
-            )
+            directories.append(os.path.join(schema_path, database, "delta", str(v)))
 
         # Used to check if we have any duplicate file names
         file_name_counter = Counter()  # type: CounterType[str]
@@ -621,8 +623,8 @@ def _get_or_create_schema_state(
     txn: Cursor, database_engine: BaseDatabaseEngine
 ) -> Optional[Tuple[int, List[str], bool]]:
     # Bluntly try creating the schema_version tables.
-    schema_path = os.path.join(dir_path, "schema", "schema_version.sql")
-    executescript(txn, schema_path)
+    sql_path = os.path.join(schema_path, "common", "schema_version.sql")
+    executescript(txn, sql_path)
 
     txn.execute("SELECT version, upgraded FROM schema_version")
     row = txn.fetchone()
diff --git a/synapse/storage/schema/README.md b/synapse/storage/schema/README.md
new file mode 100644
index 0000000000..030153db64
--- /dev/null
+++ b/synapse/storage/schema/README.md
@@ -0,0 +1,37 @@
+# Synapse Database Schemas
+
+This directory contains the schema files used to build Synapse databases.
+
+Synapse supports splitting its datastore across multiple physical databases (which can
+be useful for large installations), and the schema files are therefore split according
+to the logical database they are apply to.
+
+At the time of writing, the following "logical" databases are supported:
+
+* `state` - used to store Matrix room state (more specifically, `state_groups`,
+  their relationships and contents.)
+* `main` - stores everything else.
+
+Addionally, the `common` directory contains schema files for tables which must be
+present on *all* physical databases.
+
+## Full schema dumps
+
+In the `full_schemas` directories, only the most recently-numbered snapshot is useful
+(`54` at the time of writing). Older snapshots (eg, `16`) are present for historical
+reference only.
+
+## Building full schema dumps
+
+If you want to recreate these schemas, they need to be made from a database that
+has had all background updates run.
+
+To do so, use `scripts-dev/make_full_schema.sh`. This will produce new
+`full.sql.postgres` and `full.sql.sqlite` files.
+
+Ensure postgres is installed, then run:
+
+    ./scripts-dev/make_full_schema.sh -p postgres_username -o output_dir/
+
+NB at the time of writing, this script predates the split into separate `state`/`main`
+databases so will require updates to handle that correctly.
diff --git a/synapse/storage/schema/__init__.py b/synapse/storage/schema/__init__.py
new file mode 100644
index 0000000000..f0d9f23167
--- /dev/null
+++ b/synapse/storage/schema/__init__.py
@@ -0,0 +1,17 @@
+# Copyright 2021 The Matrix.org Foundation C.I.C.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Remember to update this number every time a change is made to database
+# schema files, so the users will be informed on server restarts.
+SCHEMA_VERSION = 59
diff --git a/synapse/storage/schema/delta/25/00background_updates.sql b/synapse/storage/schema/common/delta/25/00background_updates.sql
similarity index 100%
rename from synapse/storage/schema/delta/25/00background_updates.sql
rename to synapse/storage/schema/common/delta/25/00background_updates.sql
diff --git a/synapse/storage/schema/delta/35/00background_updates_add_col.sql b/synapse/storage/schema/common/delta/35/00background_updates_add_col.sql
similarity index 100%
rename from synapse/storage/schema/delta/35/00background_updates_add_col.sql
rename to synapse/storage/schema/common/delta/35/00background_updates_add_col.sql
diff --git a/synapse/storage/schema/delta/58/00background_update_ordering.sql b/synapse/storage/schema/common/delta/58/00background_update_ordering.sql
similarity index 100%
rename from synapse/storage/schema/delta/58/00background_update_ordering.sql
rename to synapse/storage/schema/common/delta/58/00background_update_ordering.sql
diff --git a/synapse/storage/schema/full_schemas/54/full.sql b/synapse/storage/schema/common/full_schemas/54/full.sql
similarity index 100%
rename from synapse/storage/schema/full_schemas/54/full.sql
rename to synapse/storage/schema/common/full_schemas/54/full.sql
diff --git a/synapse/storage/schema/schema_version.sql b/synapse/storage/schema/common/schema_version.sql
similarity index 100%
rename from synapse/storage/schema/schema_version.sql
rename to synapse/storage/schema/common/schema_version.sql
diff --git a/synapse/storage/databases/main/schema/delta/12/v12.sql b/synapse/storage/schema/main/delta/12/v12.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/12/v12.sql
rename to synapse/storage/schema/main/delta/12/v12.sql
diff --git a/synapse/storage/databases/main/schema/delta/13/v13.sql b/synapse/storage/schema/main/delta/13/v13.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/13/v13.sql
rename to synapse/storage/schema/main/delta/13/v13.sql
diff --git a/synapse/storage/databases/main/schema/delta/14/v14.sql b/synapse/storage/schema/main/delta/14/v14.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/14/v14.sql
rename to synapse/storage/schema/main/delta/14/v14.sql
diff --git a/synapse/storage/databases/main/schema/delta/15/appservice_txns.sql b/synapse/storage/schema/main/delta/15/appservice_txns.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/15/appservice_txns.sql
rename to synapse/storage/schema/main/delta/15/appservice_txns.sql
diff --git a/synapse/storage/databases/main/schema/delta/15/presence_indices.sql b/synapse/storage/schema/main/delta/15/presence_indices.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/15/presence_indices.sql
rename to synapse/storage/schema/main/delta/15/presence_indices.sql
diff --git a/synapse/storage/databases/main/schema/delta/15/v15.sql b/synapse/storage/schema/main/delta/15/v15.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/15/v15.sql
rename to synapse/storage/schema/main/delta/15/v15.sql
diff --git a/synapse/storage/databases/main/schema/delta/16/events_order_index.sql b/synapse/storage/schema/main/delta/16/events_order_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/16/events_order_index.sql
rename to synapse/storage/schema/main/delta/16/events_order_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/16/remote_media_cache_index.sql b/synapse/storage/schema/main/delta/16/remote_media_cache_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/16/remote_media_cache_index.sql
rename to synapse/storage/schema/main/delta/16/remote_media_cache_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/16/remove_duplicates.sql b/synapse/storage/schema/main/delta/16/remove_duplicates.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/16/remove_duplicates.sql
rename to synapse/storage/schema/main/delta/16/remove_duplicates.sql
diff --git a/synapse/storage/databases/main/schema/delta/16/room_alias_index.sql b/synapse/storage/schema/main/delta/16/room_alias_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/16/room_alias_index.sql
rename to synapse/storage/schema/main/delta/16/room_alias_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/16/unique_constraints.sql b/synapse/storage/schema/main/delta/16/unique_constraints.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/16/unique_constraints.sql
rename to synapse/storage/schema/main/delta/16/unique_constraints.sql
diff --git a/synapse/storage/databases/main/schema/delta/16/users.sql b/synapse/storage/schema/main/delta/16/users.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/16/users.sql
rename to synapse/storage/schema/main/delta/16/users.sql
diff --git a/synapse/storage/databases/main/schema/delta/17/drop_indexes.sql b/synapse/storage/schema/main/delta/17/drop_indexes.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/17/drop_indexes.sql
rename to synapse/storage/schema/main/delta/17/drop_indexes.sql
diff --git a/synapse/storage/databases/main/schema/delta/17/server_keys.sql b/synapse/storage/schema/main/delta/17/server_keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/17/server_keys.sql
rename to synapse/storage/schema/main/delta/17/server_keys.sql
diff --git a/synapse/storage/databases/main/schema/delta/17/user_threepids.sql b/synapse/storage/schema/main/delta/17/user_threepids.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/17/user_threepids.sql
rename to synapse/storage/schema/main/delta/17/user_threepids.sql
diff --git a/synapse/storage/databases/main/schema/delta/18/server_keys_bigger_ints.sql b/synapse/storage/schema/main/delta/18/server_keys_bigger_ints.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/18/server_keys_bigger_ints.sql
rename to synapse/storage/schema/main/delta/18/server_keys_bigger_ints.sql
diff --git a/synapse/storage/databases/main/schema/delta/19/event_index.sql b/synapse/storage/schema/main/delta/19/event_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/19/event_index.sql
rename to synapse/storage/schema/main/delta/19/event_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/20/dummy.sql b/synapse/storage/schema/main/delta/20/dummy.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/20/dummy.sql
rename to synapse/storage/schema/main/delta/20/dummy.sql
diff --git a/synapse/storage/databases/main/schema/delta/20/pushers.py b/synapse/storage/schema/main/delta/20/pushers.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/20/pushers.py
rename to synapse/storage/schema/main/delta/20/pushers.py
diff --git a/synapse/storage/databases/main/schema/delta/21/end_to_end_keys.sql b/synapse/storage/schema/main/delta/21/end_to_end_keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/21/end_to_end_keys.sql
rename to synapse/storage/schema/main/delta/21/end_to_end_keys.sql
diff --git a/synapse/storage/databases/main/schema/delta/21/receipts.sql b/synapse/storage/schema/main/delta/21/receipts.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/21/receipts.sql
rename to synapse/storage/schema/main/delta/21/receipts.sql
diff --git a/synapse/storage/databases/main/schema/delta/22/receipts_index.sql b/synapse/storage/schema/main/delta/22/receipts_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/22/receipts_index.sql
rename to synapse/storage/schema/main/delta/22/receipts_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/22/user_threepids_unique.sql b/synapse/storage/schema/main/delta/22/user_threepids_unique.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/22/user_threepids_unique.sql
rename to synapse/storage/schema/main/delta/22/user_threepids_unique.sql
diff --git a/synapse/storage/databases/main/schema/delta/24/stats_reporting.sql b/synapse/storage/schema/main/delta/24/stats_reporting.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/24/stats_reporting.sql
rename to synapse/storage/schema/main/delta/24/stats_reporting.sql
diff --git a/synapse/storage/databases/main/schema/delta/25/fts.py b/synapse/storage/schema/main/delta/25/fts.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/25/fts.py
rename to synapse/storage/schema/main/delta/25/fts.py
diff --git a/synapse/storage/databases/main/schema/delta/25/guest_access.sql b/synapse/storage/schema/main/delta/25/guest_access.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/25/guest_access.sql
rename to synapse/storage/schema/main/delta/25/guest_access.sql
diff --git a/synapse/storage/databases/main/schema/delta/25/history_visibility.sql b/synapse/storage/schema/main/delta/25/history_visibility.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/25/history_visibility.sql
rename to synapse/storage/schema/main/delta/25/history_visibility.sql
diff --git a/synapse/storage/databases/main/schema/delta/25/tags.sql b/synapse/storage/schema/main/delta/25/tags.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/25/tags.sql
rename to synapse/storage/schema/main/delta/25/tags.sql
diff --git a/synapse/storage/databases/main/schema/delta/26/account_data.sql b/synapse/storage/schema/main/delta/26/account_data.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/26/account_data.sql
rename to synapse/storage/schema/main/delta/26/account_data.sql
diff --git a/synapse/storage/databases/main/schema/delta/27/account_data.sql b/synapse/storage/schema/main/delta/27/account_data.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/27/account_data.sql
rename to synapse/storage/schema/main/delta/27/account_data.sql
diff --git a/synapse/storage/databases/main/schema/delta/27/forgotten_memberships.sql b/synapse/storage/schema/main/delta/27/forgotten_memberships.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/27/forgotten_memberships.sql
rename to synapse/storage/schema/main/delta/27/forgotten_memberships.sql
diff --git a/synapse/storage/databases/main/schema/delta/27/ts.py b/synapse/storage/schema/main/delta/27/ts.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/27/ts.py
rename to synapse/storage/schema/main/delta/27/ts.py
diff --git a/synapse/storage/databases/main/schema/delta/28/event_push_actions.sql b/synapse/storage/schema/main/delta/28/event_push_actions.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/28/event_push_actions.sql
rename to synapse/storage/schema/main/delta/28/event_push_actions.sql
diff --git a/synapse/storage/databases/main/schema/delta/28/events_room_stream.sql b/synapse/storage/schema/main/delta/28/events_room_stream.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/28/events_room_stream.sql
rename to synapse/storage/schema/main/delta/28/events_room_stream.sql
diff --git a/synapse/storage/databases/main/schema/delta/28/public_roms_index.sql b/synapse/storage/schema/main/delta/28/public_roms_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/28/public_roms_index.sql
rename to synapse/storage/schema/main/delta/28/public_roms_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/28/receipts_user_id_index.sql b/synapse/storage/schema/main/delta/28/receipts_user_id_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/28/receipts_user_id_index.sql
rename to synapse/storage/schema/main/delta/28/receipts_user_id_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/28/upgrade_times.sql b/synapse/storage/schema/main/delta/28/upgrade_times.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/28/upgrade_times.sql
rename to synapse/storage/schema/main/delta/28/upgrade_times.sql
diff --git a/synapse/storage/databases/main/schema/delta/28/users_is_guest.sql b/synapse/storage/schema/main/delta/28/users_is_guest.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/28/users_is_guest.sql
rename to synapse/storage/schema/main/delta/28/users_is_guest.sql
diff --git a/synapse/storage/databases/main/schema/delta/29/push_actions.sql b/synapse/storage/schema/main/delta/29/push_actions.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/29/push_actions.sql
rename to synapse/storage/schema/main/delta/29/push_actions.sql
diff --git a/synapse/storage/databases/main/schema/delta/30/alias_creator.sql b/synapse/storage/schema/main/delta/30/alias_creator.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/30/alias_creator.sql
rename to synapse/storage/schema/main/delta/30/alias_creator.sql
diff --git a/synapse/storage/databases/main/schema/delta/30/as_users.py b/synapse/storage/schema/main/delta/30/as_users.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/30/as_users.py
rename to synapse/storage/schema/main/delta/30/as_users.py
diff --git a/synapse/storage/databases/main/schema/delta/30/deleted_pushers.sql b/synapse/storage/schema/main/delta/30/deleted_pushers.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/30/deleted_pushers.sql
rename to synapse/storage/schema/main/delta/30/deleted_pushers.sql
diff --git a/synapse/storage/databases/main/schema/delta/30/presence_stream.sql b/synapse/storage/schema/main/delta/30/presence_stream.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/30/presence_stream.sql
rename to synapse/storage/schema/main/delta/30/presence_stream.sql
diff --git a/synapse/storage/databases/main/schema/delta/30/public_rooms.sql b/synapse/storage/schema/main/delta/30/public_rooms.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/30/public_rooms.sql
rename to synapse/storage/schema/main/delta/30/public_rooms.sql
diff --git a/synapse/storage/databases/main/schema/delta/30/push_rule_stream.sql b/synapse/storage/schema/main/delta/30/push_rule_stream.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/30/push_rule_stream.sql
rename to synapse/storage/schema/main/delta/30/push_rule_stream.sql
diff --git a/synapse/storage/databases/main/schema/delta/30/threepid_guest_access_tokens.sql b/synapse/storage/schema/main/delta/30/threepid_guest_access_tokens.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/30/threepid_guest_access_tokens.sql
rename to synapse/storage/schema/main/delta/30/threepid_guest_access_tokens.sql
diff --git a/synapse/storage/databases/main/schema/delta/31/invites.sql b/synapse/storage/schema/main/delta/31/invites.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/31/invites.sql
rename to synapse/storage/schema/main/delta/31/invites.sql
diff --git a/synapse/storage/databases/main/schema/delta/31/local_media_repository_url_cache.sql b/synapse/storage/schema/main/delta/31/local_media_repository_url_cache.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/31/local_media_repository_url_cache.sql
rename to synapse/storage/schema/main/delta/31/local_media_repository_url_cache.sql
diff --git a/synapse/storage/databases/main/schema/delta/31/pushers.py b/synapse/storage/schema/main/delta/31/pushers.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/31/pushers.py
rename to synapse/storage/schema/main/delta/31/pushers.py
diff --git a/synapse/storage/databases/main/schema/delta/31/pushers_index.sql b/synapse/storage/schema/main/delta/31/pushers_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/31/pushers_index.sql
rename to synapse/storage/schema/main/delta/31/pushers_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/31/search_update.py b/synapse/storage/schema/main/delta/31/search_update.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/31/search_update.py
rename to synapse/storage/schema/main/delta/31/search_update.py
diff --git a/synapse/storage/databases/main/schema/delta/32/events.sql b/synapse/storage/schema/main/delta/32/events.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/32/events.sql
rename to synapse/storage/schema/main/delta/32/events.sql
diff --git a/synapse/storage/databases/main/schema/delta/32/openid.sql b/synapse/storage/schema/main/delta/32/openid.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/32/openid.sql
rename to synapse/storage/schema/main/delta/32/openid.sql
diff --git a/synapse/storage/databases/main/schema/delta/32/pusher_throttle.sql b/synapse/storage/schema/main/delta/32/pusher_throttle.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/32/pusher_throttle.sql
rename to synapse/storage/schema/main/delta/32/pusher_throttle.sql
diff --git a/synapse/storage/databases/main/schema/delta/32/remove_indices.sql b/synapse/storage/schema/main/delta/32/remove_indices.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/32/remove_indices.sql
rename to synapse/storage/schema/main/delta/32/remove_indices.sql
diff --git a/synapse/storage/databases/main/schema/delta/32/reports.sql b/synapse/storage/schema/main/delta/32/reports.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/32/reports.sql
rename to synapse/storage/schema/main/delta/32/reports.sql
diff --git a/synapse/storage/databases/main/schema/delta/33/access_tokens_device_index.sql b/synapse/storage/schema/main/delta/33/access_tokens_device_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/33/access_tokens_device_index.sql
rename to synapse/storage/schema/main/delta/33/access_tokens_device_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/33/devices.sql b/synapse/storage/schema/main/delta/33/devices.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/33/devices.sql
rename to synapse/storage/schema/main/delta/33/devices.sql
diff --git a/synapse/storage/databases/main/schema/delta/33/devices_for_e2e_keys.sql b/synapse/storage/schema/main/delta/33/devices_for_e2e_keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/33/devices_for_e2e_keys.sql
rename to synapse/storage/schema/main/delta/33/devices_for_e2e_keys.sql
diff --git a/synapse/storage/databases/main/schema/delta/33/devices_for_e2e_keys_clear_unknown_device.sql b/synapse/storage/schema/main/delta/33/devices_for_e2e_keys_clear_unknown_device.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/33/devices_for_e2e_keys_clear_unknown_device.sql
rename to synapse/storage/schema/main/delta/33/devices_for_e2e_keys_clear_unknown_device.sql
diff --git a/synapse/storage/databases/main/schema/delta/33/event_fields.py b/synapse/storage/schema/main/delta/33/event_fields.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/33/event_fields.py
rename to synapse/storage/schema/main/delta/33/event_fields.py
diff --git a/synapse/storage/databases/main/schema/delta/33/remote_media_ts.py b/synapse/storage/schema/main/delta/33/remote_media_ts.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/33/remote_media_ts.py
rename to synapse/storage/schema/main/delta/33/remote_media_ts.py
diff --git a/synapse/storage/databases/main/schema/delta/33/user_ips_index.sql b/synapse/storage/schema/main/delta/33/user_ips_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/33/user_ips_index.sql
rename to synapse/storage/schema/main/delta/33/user_ips_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/34/appservice_stream.sql b/synapse/storage/schema/main/delta/34/appservice_stream.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/34/appservice_stream.sql
rename to synapse/storage/schema/main/delta/34/appservice_stream.sql
diff --git a/synapse/storage/databases/main/schema/delta/34/cache_stream.py b/synapse/storage/schema/main/delta/34/cache_stream.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/34/cache_stream.py
rename to synapse/storage/schema/main/delta/34/cache_stream.py
diff --git a/synapse/storage/databases/main/schema/delta/34/device_inbox.sql b/synapse/storage/schema/main/delta/34/device_inbox.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/34/device_inbox.sql
rename to synapse/storage/schema/main/delta/34/device_inbox.sql
diff --git a/synapse/storage/databases/main/schema/delta/34/push_display_name_rename.sql b/synapse/storage/schema/main/delta/34/push_display_name_rename.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/34/push_display_name_rename.sql
rename to synapse/storage/schema/main/delta/34/push_display_name_rename.sql
diff --git a/synapse/storage/databases/main/schema/delta/34/received_txn_purge.py b/synapse/storage/schema/main/delta/34/received_txn_purge.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/34/received_txn_purge.py
rename to synapse/storage/schema/main/delta/34/received_txn_purge.py
diff --git a/synapse/storage/databases/main/schema/delta/35/contains_url.sql b/synapse/storage/schema/main/delta/35/contains_url.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/35/contains_url.sql
rename to synapse/storage/schema/main/delta/35/contains_url.sql
diff --git a/synapse/storage/databases/main/schema/delta/35/device_outbox.sql b/synapse/storage/schema/main/delta/35/device_outbox.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/35/device_outbox.sql
rename to synapse/storage/schema/main/delta/35/device_outbox.sql
diff --git a/synapse/storage/databases/main/schema/delta/35/device_stream_id.sql b/synapse/storage/schema/main/delta/35/device_stream_id.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/35/device_stream_id.sql
rename to synapse/storage/schema/main/delta/35/device_stream_id.sql
diff --git a/synapse/storage/databases/main/schema/delta/35/event_push_actions_index.sql b/synapse/storage/schema/main/delta/35/event_push_actions_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/35/event_push_actions_index.sql
rename to synapse/storage/schema/main/delta/35/event_push_actions_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/35/public_room_list_change_stream.sql b/synapse/storage/schema/main/delta/35/public_room_list_change_stream.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/35/public_room_list_change_stream.sql
rename to synapse/storage/schema/main/delta/35/public_room_list_change_stream.sql
diff --git a/synapse/storage/databases/main/schema/delta/35/stream_order_to_extrem.sql b/synapse/storage/schema/main/delta/35/stream_order_to_extrem.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/35/stream_order_to_extrem.sql
rename to synapse/storage/schema/main/delta/35/stream_order_to_extrem.sql
diff --git a/synapse/storage/databases/main/schema/delta/36/readd_public_rooms.sql b/synapse/storage/schema/main/delta/36/readd_public_rooms.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/36/readd_public_rooms.sql
rename to synapse/storage/schema/main/delta/36/readd_public_rooms.sql
diff --git a/synapse/storage/databases/main/schema/delta/37/remove_auth_idx.py b/synapse/storage/schema/main/delta/37/remove_auth_idx.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/37/remove_auth_idx.py
rename to synapse/storage/schema/main/delta/37/remove_auth_idx.py
diff --git a/synapse/storage/databases/main/schema/delta/37/user_threepids.sql b/synapse/storage/schema/main/delta/37/user_threepids.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/37/user_threepids.sql
rename to synapse/storage/schema/main/delta/37/user_threepids.sql
diff --git a/synapse/storage/databases/main/schema/delta/38/postgres_fts_gist.sql b/synapse/storage/schema/main/delta/38/postgres_fts_gist.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/38/postgres_fts_gist.sql
rename to synapse/storage/schema/main/delta/38/postgres_fts_gist.sql
diff --git a/synapse/storage/databases/main/schema/delta/39/appservice_room_list.sql b/synapse/storage/schema/main/delta/39/appservice_room_list.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/39/appservice_room_list.sql
rename to synapse/storage/schema/main/delta/39/appservice_room_list.sql
diff --git a/synapse/storage/databases/main/schema/delta/39/device_federation_stream_idx.sql b/synapse/storage/schema/main/delta/39/device_federation_stream_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/39/device_federation_stream_idx.sql
rename to synapse/storage/schema/main/delta/39/device_federation_stream_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/39/event_push_index.sql b/synapse/storage/schema/main/delta/39/event_push_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/39/event_push_index.sql
rename to synapse/storage/schema/main/delta/39/event_push_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/39/federation_out_position.sql b/synapse/storage/schema/main/delta/39/federation_out_position.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/39/federation_out_position.sql
rename to synapse/storage/schema/main/delta/39/federation_out_position.sql
diff --git a/synapse/storage/databases/main/schema/delta/39/membership_profile.sql b/synapse/storage/schema/main/delta/39/membership_profile.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/39/membership_profile.sql
rename to synapse/storage/schema/main/delta/39/membership_profile.sql
diff --git a/synapse/storage/databases/main/schema/delta/40/current_state_idx.sql b/synapse/storage/schema/main/delta/40/current_state_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/40/current_state_idx.sql
rename to synapse/storage/schema/main/delta/40/current_state_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/40/device_inbox.sql b/synapse/storage/schema/main/delta/40/device_inbox.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/40/device_inbox.sql
rename to synapse/storage/schema/main/delta/40/device_inbox.sql
diff --git a/synapse/storage/databases/main/schema/delta/40/device_list_streams.sql b/synapse/storage/schema/main/delta/40/device_list_streams.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/40/device_list_streams.sql
rename to synapse/storage/schema/main/delta/40/device_list_streams.sql
diff --git a/synapse/storage/databases/main/schema/delta/40/event_push_summary.sql b/synapse/storage/schema/main/delta/40/event_push_summary.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/40/event_push_summary.sql
rename to synapse/storage/schema/main/delta/40/event_push_summary.sql
diff --git a/synapse/storage/databases/main/schema/delta/40/pushers.sql b/synapse/storage/schema/main/delta/40/pushers.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/40/pushers.sql
rename to synapse/storage/schema/main/delta/40/pushers.sql
diff --git a/synapse/storage/databases/main/schema/delta/41/device_list_stream_idx.sql b/synapse/storage/schema/main/delta/41/device_list_stream_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/41/device_list_stream_idx.sql
rename to synapse/storage/schema/main/delta/41/device_list_stream_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/41/device_outbound_index.sql b/synapse/storage/schema/main/delta/41/device_outbound_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/41/device_outbound_index.sql
rename to synapse/storage/schema/main/delta/41/device_outbound_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/41/event_search_event_id_idx.sql b/synapse/storage/schema/main/delta/41/event_search_event_id_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/41/event_search_event_id_idx.sql
rename to synapse/storage/schema/main/delta/41/event_search_event_id_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/41/ratelimit.sql b/synapse/storage/schema/main/delta/41/ratelimit.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/41/ratelimit.sql
rename to synapse/storage/schema/main/delta/41/ratelimit.sql
diff --git a/synapse/storage/databases/main/schema/delta/42/current_state_delta.sql b/synapse/storage/schema/main/delta/42/current_state_delta.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/42/current_state_delta.sql
rename to synapse/storage/schema/main/delta/42/current_state_delta.sql
diff --git a/synapse/storage/databases/main/schema/delta/42/device_list_last_id.sql b/synapse/storage/schema/main/delta/42/device_list_last_id.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/42/device_list_last_id.sql
rename to synapse/storage/schema/main/delta/42/device_list_last_id.sql
diff --git a/synapse/storage/databases/main/schema/delta/42/event_auth_state_only.sql b/synapse/storage/schema/main/delta/42/event_auth_state_only.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/42/event_auth_state_only.sql
rename to synapse/storage/schema/main/delta/42/event_auth_state_only.sql
diff --git a/synapse/storage/databases/main/schema/delta/42/user_dir.py b/synapse/storage/schema/main/delta/42/user_dir.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/42/user_dir.py
rename to synapse/storage/schema/main/delta/42/user_dir.py
diff --git a/synapse/storage/databases/main/schema/delta/43/blocked_rooms.sql b/synapse/storage/schema/main/delta/43/blocked_rooms.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/43/blocked_rooms.sql
rename to synapse/storage/schema/main/delta/43/blocked_rooms.sql
diff --git a/synapse/storage/databases/main/schema/delta/43/quarantine_media.sql b/synapse/storage/schema/main/delta/43/quarantine_media.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/43/quarantine_media.sql
rename to synapse/storage/schema/main/delta/43/quarantine_media.sql
diff --git a/synapse/storage/databases/main/schema/delta/43/url_cache.sql b/synapse/storage/schema/main/delta/43/url_cache.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/43/url_cache.sql
rename to synapse/storage/schema/main/delta/43/url_cache.sql
diff --git a/synapse/storage/databases/main/schema/delta/43/user_share.sql b/synapse/storage/schema/main/delta/43/user_share.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/43/user_share.sql
rename to synapse/storage/schema/main/delta/43/user_share.sql
diff --git a/synapse/storage/databases/main/schema/delta/44/expire_url_cache.sql b/synapse/storage/schema/main/delta/44/expire_url_cache.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/44/expire_url_cache.sql
rename to synapse/storage/schema/main/delta/44/expire_url_cache.sql
diff --git a/synapse/storage/databases/main/schema/delta/45/group_server.sql b/synapse/storage/schema/main/delta/45/group_server.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/45/group_server.sql
rename to synapse/storage/schema/main/delta/45/group_server.sql
diff --git a/synapse/storage/databases/main/schema/delta/45/profile_cache.sql b/synapse/storage/schema/main/delta/45/profile_cache.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/45/profile_cache.sql
rename to synapse/storage/schema/main/delta/45/profile_cache.sql
diff --git a/synapse/storage/databases/main/schema/delta/46/drop_refresh_tokens.sql b/synapse/storage/schema/main/delta/46/drop_refresh_tokens.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/46/drop_refresh_tokens.sql
rename to synapse/storage/schema/main/delta/46/drop_refresh_tokens.sql
diff --git a/synapse/storage/databases/main/schema/delta/46/drop_unique_deleted_pushers.sql b/synapse/storage/schema/main/delta/46/drop_unique_deleted_pushers.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/46/drop_unique_deleted_pushers.sql
rename to synapse/storage/schema/main/delta/46/drop_unique_deleted_pushers.sql
diff --git a/synapse/storage/databases/main/schema/delta/46/group_server.sql b/synapse/storage/schema/main/delta/46/group_server.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/46/group_server.sql
rename to synapse/storage/schema/main/delta/46/group_server.sql
diff --git a/synapse/storage/databases/main/schema/delta/46/local_media_repository_url_idx.sql b/synapse/storage/schema/main/delta/46/local_media_repository_url_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/46/local_media_repository_url_idx.sql
rename to synapse/storage/schema/main/delta/46/local_media_repository_url_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/46/user_dir_null_room_ids.sql b/synapse/storage/schema/main/delta/46/user_dir_null_room_ids.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/46/user_dir_null_room_ids.sql
rename to synapse/storage/schema/main/delta/46/user_dir_null_room_ids.sql
diff --git a/synapse/storage/databases/main/schema/delta/46/user_dir_typos.sql b/synapse/storage/schema/main/delta/46/user_dir_typos.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/46/user_dir_typos.sql
rename to synapse/storage/schema/main/delta/46/user_dir_typos.sql
diff --git a/synapse/storage/databases/main/schema/delta/47/last_access_media.sql b/synapse/storage/schema/main/delta/47/last_access_media.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/47/last_access_media.sql
rename to synapse/storage/schema/main/delta/47/last_access_media.sql
diff --git a/synapse/storage/databases/main/schema/delta/47/postgres_fts_gin.sql b/synapse/storage/schema/main/delta/47/postgres_fts_gin.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/47/postgres_fts_gin.sql
rename to synapse/storage/schema/main/delta/47/postgres_fts_gin.sql
diff --git a/synapse/storage/databases/main/schema/delta/47/push_actions_staging.sql b/synapse/storage/schema/main/delta/47/push_actions_staging.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/47/push_actions_staging.sql
rename to synapse/storage/schema/main/delta/47/push_actions_staging.sql
diff --git a/synapse/storage/databases/main/schema/delta/48/add_user_consent.sql b/synapse/storage/schema/main/delta/48/add_user_consent.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/48/add_user_consent.sql
rename to synapse/storage/schema/main/delta/48/add_user_consent.sql
diff --git a/synapse/storage/databases/main/schema/delta/48/add_user_ips_last_seen_index.sql b/synapse/storage/schema/main/delta/48/add_user_ips_last_seen_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/48/add_user_ips_last_seen_index.sql
rename to synapse/storage/schema/main/delta/48/add_user_ips_last_seen_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/48/deactivated_users.sql b/synapse/storage/schema/main/delta/48/deactivated_users.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/48/deactivated_users.sql
rename to synapse/storage/schema/main/delta/48/deactivated_users.sql
diff --git a/synapse/storage/databases/main/schema/delta/48/group_unique_indexes.py b/synapse/storage/schema/main/delta/48/group_unique_indexes.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/48/group_unique_indexes.py
rename to synapse/storage/schema/main/delta/48/group_unique_indexes.py
diff --git a/synapse/storage/databases/main/schema/delta/48/groups_joinable.sql b/synapse/storage/schema/main/delta/48/groups_joinable.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/48/groups_joinable.sql
rename to synapse/storage/schema/main/delta/48/groups_joinable.sql
diff --git a/synapse/storage/databases/main/schema/delta/49/add_user_consent_server_notice_sent.sql b/synapse/storage/schema/main/delta/49/add_user_consent_server_notice_sent.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/49/add_user_consent_server_notice_sent.sql
rename to synapse/storage/schema/main/delta/49/add_user_consent_server_notice_sent.sql
diff --git a/synapse/storage/databases/main/schema/delta/49/add_user_daily_visits.sql b/synapse/storage/schema/main/delta/49/add_user_daily_visits.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/49/add_user_daily_visits.sql
rename to synapse/storage/schema/main/delta/49/add_user_daily_visits.sql
diff --git a/synapse/storage/databases/main/schema/delta/49/add_user_ips_last_seen_only_index.sql b/synapse/storage/schema/main/delta/49/add_user_ips_last_seen_only_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/49/add_user_ips_last_seen_only_index.sql
rename to synapse/storage/schema/main/delta/49/add_user_ips_last_seen_only_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/50/add_creation_ts_users_index.sql b/synapse/storage/schema/main/delta/50/add_creation_ts_users_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/50/add_creation_ts_users_index.sql
rename to synapse/storage/schema/main/delta/50/add_creation_ts_users_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/50/erasure_store.sql b/synapse/storage/schema/main/delta/50/erasure_store.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/50/erasure_store.sql
rename to synapse/storage/schema/main/delta/50/erasure_store.sql
diff --git a/synapse/storage/databases/main/schema/delta/50/make_event_content_nullable.py b/synapse/storage/schema/main/delta/50/make_event_content_nullable.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/50/make_event_content_nullable.py
rename to synapse/storage/schema/main/delta/50/make_event_content_nullable.py
diff --git a/synapse/storage/databases/main/schema/delta/51/e2e_room_keys.sql b/synapse/storage/schema/main/delta/51/e2e_room_keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/51/e2e_room_keys.sql
rename to synapse/storage/schema/main/delta/51/e2e_room_keys.sql
diff --git a/synapse/storage/databases/main/schema/delta/51/monthly_active_users.sql b/synapse/storage/schema/main/delta/51/monthly_active_users.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/51/monthly_active_users.sql
rename to synapse/storage/schema/main/delta/51/monthly_active_users.sql
diff --git a/synapse/storage/databases/main/schema/delta/52/add_event_to_state_group_index.sql b/synapse/storage/schema/main/delta/52/add_event_to_state_group_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/52/add_event_to_state_group_index.sql
rename to synapse/storage/schema/main/delta/52/add_event_to_state_group_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/52/device_list_streams_unique_idx.sql b/synapse/storage/schema/main/delta/52/device_list_streams_unique_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/52/device_list_streams_unique_idx.sql
rename to synapse/storage/schema/main/delta/52/device_list_streams_unique_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/52/e2e_room_keys.sql b/synapse/storage/schema/main/delta/52/e2e_room_keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/52/e2e_room_keys.sql
rename to synapse/storage/schema/main/delta/52/e2e_room_keys.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/add_user_type_to_users.sql b/synapse/storage/schema/main/delta/53/add_user_type_to_users.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/add_user_type_to_users.sql
rename to synapse/storage/schema/main/delta/53/add_user_type_to_users.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/drop_sent_transactions.sql b/synapse/storage/schema/main/delta/53/drop_sent_transactions.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/drop_sent_transactions.sql
rename to synapse/storage/schema/main/delta/53/drop_sent_transactions.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/event_format_version.sql b/synapse/storage/schema/main/delta/53/event_format_version.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/event_format_version.sql
rename to synapse/storage/schema/main/delta/53/event_format_version.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/user_dir_populate.sql b/synapse/storage/schema/main/delta/53/user_dir_populate.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/user_dir_populate.sql
rename to synapse/storage/schema/main/delta/53/user_dir_populate.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/user_ips_index.sql b/synapse/storage/schema/main/delta/53/user_ips_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/user_ips_index.sql
rename to synapse/storage/schema/main/delta/53/user_ips_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/user_share.sql b/synapse/storage/schema/main/delta/53/user_share.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/user_share.sql
rename to synapse/storage/schema/main/delta/53/user_share.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/user_threepid_id.sql b/synapse/storage/schema/main/delta/53/user_threepid_id.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/user_threepid_id.sql
rename to synapse/storage/schema/main/delta/53/user_threepid_id.sql
diff --git a/synapse/storage/databases/main/schema/delta/53/users_in_public_rooms.sql b/synapse/storage/schema/main/delta/53/users_in_public_rooms.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/53/users_in_public_rooms.sql
rename to synapse/storage/schema/main/delta/53/users_in_public_rooms.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/account_validity_with_renewal.sql b/synapse/storage/schema/main/delta/54/account_validity_with_renewal.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/account_validity_with_renewal.sql
rename to synapse/storage/schema/main/delta/54/account_validity_with_renewal.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/add_validity_to_server_keys.sql b/synapse/storage/schema/main/delta/54/add_validity_to_server_keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/add_validity_to_server_keys.sql
rename to synapse/storage/schema/main/delta/54/add_validity_to_server_keys.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/delete_forward_extremities.sql b/synapse/storage/schema/main/delta/54/delete_forward_extremities.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/delete_forward_extremities.sql
rename to synapse/storage/schema/main/delta/54/delete_forward_extremities.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/drop_legacy_tables.sql b/synapse/storage/schema/main/delta/54/drop_legacy_tables.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/drop_legacy_tables.sql
rename to synapse/storage/schema/main/delta/54/drop_legacy_tables.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/drop_presence_list.sql b/synapse/storage/schema/main/delta/54/drop_presence_list.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/drop_presence_list.sql
rename to synapse/storage/schema/main/delta/54/drop_presence_list.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/relations.sql b/synapse/storage/schema/main/delta/54/relations.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/relations.sql
rename to synapse/storage/schema/main/delta/54/relations.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/stats.sql b/synapse/storage/schema/main/delta/54/stats.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/stats.sql
rename to synapse/storage/schema/main/delta/54/stats.sql
diff --git a/synapse/storage/databases/main/schema/delta/54/stats2.sql b/synapse/storage/schema/main/delta/54/stats2.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/54/stats2.sql
rename to synapse/storage/schema/main/delta/54/stats2.sql
diff --git a/synapse/storage/databases/main/schema/delta/55/access_token_expiry.sql b/synapse/storage/schema/main/delta/55/access_token_expiry.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/55/access_token_expiry.sql
rename to synapse/storage/schema/main/delta/55/access_token_expiry.sql
diff --git a/synapse/storage/databases/main/schema/delta/55/track_threepid_validations.sql b/synapse/storage/schema/main/delta/55/track_threepid_validations.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/55/track_threepid_validations.sql
rename to synapse/storage/schema/main/delta/55/track_threepid_validations.sql
diff --git a/synapse/storage/databases/main/schema/delta/55/users_alter_deactivated.sql b/synapse/storage/schema/main/delta/55/users_alter_deactivated.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/55/users_alter_deactivated.sql
rename to synapse/storage/schema/main/delta/55/users_alter_deactivated.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/add_spans_to_device_lists.sql b/synapse/storage/schema/main/delta/56/add_spans_to_device_lists.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/add_spans_to_device_lists.sql
rename to synapse/storage/schema/main/delta/56/add_spans_to_device_lists.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/current_state_events_membership.sql b/synapse/storage/schema/main/delta/56/current_state_events_membership.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/current_state_events_membership.sql
rename to synapse/storage/schema/main/delta/56/current_state_events_membership.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/current_state_events_membership_mk2.sql b/synapse/storage/schema/main/delta/56/current_state_events_membership_mk2.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/current_state_events_membership_mk2.sql
rename to synapse/storage/schema/main/delta/56/current_state_events_membership_mk2.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/delete_keys_from_deleted_backups.sql b/synapse/storage/schema/main/delta/56/delete_keys_from_deleted_backups.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/delete_keys_from_deleted_backups.sql
rename to synapse/storage/schema/main/delta/56/delete_keys_from_deleted_backups.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/destinations_failure_ts.sql b/synapse/storage/schema/main/delta/56/destinations_failure_ts.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/destinations_failure_ts.sql
rename to synapse/storage/schema/main/delta/56/destinations_failure_ts.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/destinations_retry_interval_type.sql.postgres b/synapse/storage/schema/main/delta/56/destinations_retry_interval_type.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/destinations_retry_interval_type.sql.postgres
rename to synapse/storage/schema/main/delta/56/destinations_retry_interval_type.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/56/device_stream_id_insert.sql b/synapse/storage/schema/main/delta/56/device_stream_id_insert.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/device_stream_id_insert.sql
rename to synapse/storage/schema/main/delta/56/device_stream_id_insert.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/devices_last_seen.sql b/synapse/storage/schema/main/delta/56/devices_last_seen.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/devices_last_seen.sql
rename to synapse/storage/schema/main/delta/56/devices_last_seen.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/drop_unused_event_tables.sql b/synapse/storage/schema/main/delta/56/drop_unused_event_tables.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/drop_unused_event_tables.sql
rename to synapse/storage/schema/main/delta/56/drop_unused_event_tables.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/event_expiry.sql b/synapse/storage/schema/main/delta/56/event_expiry.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/event_expiry.sql
rename to synapse/storage/schema/main/delta/56/event_expiry.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/event_labels.sql b/synapse/storage/schema/main/delta/56/event_labels.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/event_labels.sql
rename to synapse/storage/schema/main/delta/56/event_labels.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/event_labels_background_update.sql b/synapse/storage/schema/main/delta/56/event_labels_background_update.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/event_labels_background_update.sql
rename to synapse/storage/schema/main/delta/56/event_labels_background_update.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/fix_room_keys_index.sql b/synapse/storage/schema/main/delta/56/fix_room_keys_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/fix_room_keys_index.sql
rename to synapse/storage/schema/main/delta/56/fix_room_keys_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/hidden_devices.sql b/synapse/storage/schema/main/delta/56/hidden_devices.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/hidden_devices.sql
rename to synapse/storage/schema/main/delta/56/hidden_devices.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/hidden_devices_fix.sql.sqlite b/synapse/storage/schema/main/delta/56/hidden_devices_fix.sql.sqlite
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/hidden_devices_fix.sql.sqlite
rename to synapse/storage/schema/main/delta/56/hidden_devices_fix.sql.sqlite
diff --git a/synapse/storage/databases/main/schema/delta/56/nuke_empty_communities_from_db.sql b/synapse/storage/schema/main/delta/56/nuke_empty_communities_from_db.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/nuke_empty_communities_from_db.sql
rename to synapse/storage/schema/main/delta/56/nuke_empty_communities_from_db.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/public_room_list_idx.sql b/synapse/storage/schema/main/delta/56/public_room_list_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/public_room_list_idx.sql
rename to synapse/storage/schema/main/delta/56/public_room_list_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/redaction_censor.sql b/synapse/storage/schema/main/delta/56/redaction_censor.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/redaction_censor.sql
rename to synapse/storage/schema/main/delta/56/redaction_censor.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/redaction_censor2.sql b/synapse/storage/schema/main/delta/56/redaction_censor2.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/redaction_censor2.sql
rename to synapse/storage/schema/main/delta/56/redaction_censor2.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/redaction_censor3_fix_update.sql.postgres b/synapse/storage/schema/main/delta/56/redaction_censor3_fix_update.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/redaction_censor3_fix_update.sql.postgres
rename to synapse/storage/schema/main/delta/56/redaction_censor3_fix_update.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/56/redaction_censor4.sql b/synapse/storage/schema/main/delta/56/redaction_censor4.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/redaction_censor4.sql
rename to synapse/storage/schema/main/delta/56/redaction_censor4.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/remove_tombstoned_rooms_from_directory.sql b/synapse/storage/schema/main/delta/56/remove_tombstoned_rooms_from_directory.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/remove_tombstoned_rooms_from_directory.sql
rename to synapse/storage/schema/main/delta/56/remove_tombstoned_rooms_from_directory.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/room_key_etag.sql b/synapse/storage/schema/main/delta/56/room_key_etag.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/room_key_etag.sql
rename to synapse/storage/schema/main/delta/56/room_key_etag.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/room_membership_idx.sql b/synapse/storage/schema/main/delta/56/room_membership_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/room_membership_idx.sql
rename to synapse/storage/schema/main/delta/56/room_membership_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/room_retention.sql b/synapse/storage/schema/main/delta/56/room_retention.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/room_retention.sql
rename to synapse/storage/schema/main/delta/56/room_retention.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/signing_keys.sql b/synapse/storage/schema/main/delta/56/signing_keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/signing_keys.sql
rename to synapse/storage/schema/main/delta/56/signing_keys.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/signing_keys_nonunique_signatures.sql b/synapse/storage/schema/main/delta/56/signing_keys_nonunique_signatures.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/signing_keys_nonunique_signatures.sql
rename to synapse/storage/schema/main/delta/56/signing_keys_nonunique_signatures.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/stats_separated.sql b/synapse/storage/schema/main/delta/56/stats_separated.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/stats_separated.sql
rename to synapse/storage/schema/main/delta/56/stats_separated.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/unique_user_filter_index.py b/synapse/storage/schema/main/delta/56/unique_user_filter_index.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/unique_user_filter_index.py
rename to synapse/storage/schema/main/delta/56/unique_user_filter_index.py
diff --git a/synapse/storage/databases/main/schema/delta/56/user_external_ids.sql b/synapse/storage/schema/main/delta/56/user_external_ids.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/user_external_ids.sql
rename to synapse/storage/schema/main/delta/56/user_external_ids.sql
diff --git a/synapse/storage/databases/main/schema/delta/56/users_in_public_rooms_idx.sql b/synapse/storage/schema/main/delta/56/users_in_public_rooms_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/56/users_in_public_rooms_idx.sql
rename to synapse/storage/schema/main/delta/56/users_in_public_rooms_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/57/delete_old_current_state_events.sql b/synapse/storage/schema/main/delta/57/delete_old_current_state_events.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/delete_old_current_state_events.sql
rename to synapse/storage/schema/main/delta/57/delete_old_current_state_events.sql
diff --git a/synapse/storage/databases/main/schema/delta/57/device_list_remote_cache_stale.sql b/synapse/storage/schema/main/delta/57/device_list_remote_cache_stale.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/device_list_remote_cache_stale.sql
rename to synapse/storage/schema/main/delta/57/device_list_remote_cache_stale.sql
diff --git a/synapse/storage/databases/main/schema/delta/57/local_current_membership.py b/synapse/storage/schema/main/delta/57/local_current_membership.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/local_current_membership.py
rename to synapse/storage/schema/main/delta/57/local_current_membership.py
diff --git a/synapse/storage/databases/main/schema/delta/57/remove_sent_outbound_pokes.sql b/synapse/storage/schema/main/delta/57/remove_sent_outbound_pokes.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/remove_sent_outbound_pokes.sql
rename to synapse/storage/schema/main/delta/57/remove_sent_outbound_pokes.sql
diff --git a/synapse/storage/databases/main/schema/delta/57/rooms_version_column.sql b/synapse/storage/schema/main/delta/57/rooms_version_column.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/rooms_version_column.sql
rename to synapse/storage/schema/main/delta/57/rooms_version_column.sql
diff --git a/synapse/storage/databases/main/schema/delta/57/rooms_version_column_2.sql.postgres b/synapse/storage/schema/main/delta/57/rooms_version_column_2.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/rooms_version_column_2.sql.postgres
rename to synapse/storage/schema/main/delta/57/rooms_version_column_2.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/57/rooms_version_column_2.sql.sqlite b/synapse/storage/schema/main/delta/57/rooms_version_column_2.sql.sqlite
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/rooms_version_column_2.sql.sqlite
rename to synapse/storage/schema/main/delta/57/rooms_version_column_2.sql.sqlite
diff --git a/synapse/storage/databases/main/schema/delta/57/rooms_version_column_3.sql.postgres b/synapse/storage/schema/main/delta/57/rooms_version_column_3.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/rooms_version_column_3.sql.postgres
rename to synapse/storage/schema/main/delta/57/rooms_version_column_3.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/57/rooms_version_column_3.sql.sqlite b/synapse/storage/schema/main/delta/57/rooms_version_column_3.sql.sqlite
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/57/rooms_version_column_3.sql.sqlite
rename to synapse/storage/schema/main/delta/57/rooms_version_column_3.sql.sqlite
diff --git a/synapse/storage/databases/main/schema/delta/58/02remove_dup_outbound_pokes.sql b/synapse/storage/schema/main/delta/58/02remove_dup_outbound_pokes.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/02remove_dup_outbound_pokes.sql
rename to synapse/storage/schema/main/delta/58/02remove_dup_outbound_pokes.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/03persist_ui_auth.sql b/synapse/storage/schema/main/delta/58/03persist_ui_auth.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/03persist_ui_auth.sql
rename to synapse/storage/schema/main/delta/58/03persist_ui_auth.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/05cache_instance.sql.postgres b/synapse/storage/schema/main/delta/58/05cache_instance.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/05cache_instance.sql.postgres
rename to synapse/storage/schema/main/delta/58/05cache_instance.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/58/06dlols_unique_idx.py b/synapse/storage/schema/main/delta/58/06dlols_unique_idx.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/06dlols_unique_idx.py
rename to synapse/storage/schema/main/delta/58/06dlols_unique_idx.py
diff --git a/synapse/storage/databases/main/schema/delta/58/07add_method_to_thumbnail_constraint.sql.postgres b/synapse/storage/schema/main/delta/58/07add_method_to_thumbnail_constraint.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/07add_method_to_thumbnail_constraint.sql.postgres
rename to synapse/storage/schema/main/delta/58/07add_method_to_thumbnail_constraint.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/58/07add_method_to_thumbnail_constraint.sql.sqlite b/synapse/storage/schema/main/delta/58/07add_method_to_thumbnail_constraint.sql.sqlite
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/07add_method_to_thumbnail_constraint.sql.sqlite
rename to synapse/storage/schema/main/delta/58/07add_method_to_thumbnail_constraint.sql.sqlite
diff --git a/synapse/storage/databases/main/schema/delta/58/07persist_ui_auth_ips.sql b/synapse/storage/schema/main/delta/58/07persist_ui_auth_ips.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/07persist_ui_auth_ips.sql
rename to synapse/storage/schema/main/delta/58/07persist_ui_auth_ips.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/08_media_safe_from_quarantine.sql.postgres b/synapse/storage/schema/main/delta/58/08_media_safe_from_quarantine.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/08_media_safe_from_quarantine.sql.postgres
rename to synapse/storage/schema/main/delta/58/08_media_safe_from_quarantine.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/58/08_media_safe_from_quarantine.sql.sqlite b/synapse/storage/schema/main/delta/58/08_media_safe_from_quarantine.sql.sqlite
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/08_media_safe_from_quarantine.sql.sqlite
rename to synapse/storage/schema/main/delta/58/08_media_safe_from_quarantine.sql.sqlite
diff --git a/synapse/storage/databases/main/schema/delta/58/09shadow_ban.sql b/synapse/storage/schema/main/delta/58/09shadow_ban.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/09shadow_ban.sql
rename to synapse/storage/schema/main/delta/58/09shadow_ban.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/10_pushrules_enabled_delete_obsolete.sql b/synapse/storage/schema/main/delta/58/10_pushrules_enabled_delete_obsolete.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/10_pushrules_enabled_delete_obsolete.sql
rename to synapse/storage/schema/main/delta/58/10_pushrules_enabled_delete_obsolete.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/10drop_local_rejections_stream.sql b/synapse/storage/schema/main/delta/58/10drop_local_rejections_stream.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/10drop_local_rejections_stream.sql
rename to synapse/storage/schema/main/delta/58/10drop_local_rejections_stream.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/10federation_pos_instance_name.sql b/synapse/storage/schema/main/delta/58/10federation_pos_instance_name.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/10federation_pos_instance_name.sql
rename to synapse/storage/schema/main/delta/58/10federation_pos_instance_name.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/11dehydration.sql b/synapse/storage/schema/main/delta/58/11dehydration.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/11dehydration.sql
rename to synapse/storage/schema/main/delta/58/11dehydration.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/11fallback.sql b/synapse/storage/schema/main/delta/58/11fallback.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/11fallback.sql
rename to synapse/storage/schema/main/delta/58/11fallback.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/11user_id_seq.py b/synapse/storage/schema/main/delta/58/11user_id_seq.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/11user_id_seq.py
rename to synapse/storage/schema/main/delta/58/11user_id_seq.py
diff --git a/synapse/storage/databases/main/schema/delta/58/12room_stats.sql b/synapse/storage/schema/main/delta/58/12room_stats.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/12room_stats.sql
rename to synapse/storage/schema/main/delta/58/12room_stats.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/13remove_presence_allow_inbound.sql b/synapse/storage/schema/main/delta/58/13remove_presence_allow_inbound.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/13remove_presence_allow_inbound.sql
rename to synapse/storage/schema/main/delta/58/13remove_presence_allow_inbound.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/14events_instance_name.sql b/synapse/storage/schema/main/delta/58/14events_instance_name.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/14events_instance_name.sql
rename to synapse/storage/schema/main/delta/58/14events_instance_name.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/14events_instance_name.sql.postgres b/synapse/storage/schema/main/delta/58/14events_instance_name.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/14events_instance_name.sql.postgres
rename to synapse/storage/schema/main/delta/58/14events_instance_name.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/58/15_catchup_destination_rooms.sql b/synapse/storage/schema/main/delta/58/15_catchup_destination_rooms.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/15_catchup_destination_rooms.sql
rename to synapse/storage/schema/main/delta/58/15_catchup_destination_rooms.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/15unread_count.sql b/synapse/storage/schema/main/delta/58/15unread_count.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/15unread_count.sql
rename to synapse/storage/schema/main/delta/58/15unread_count.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/16populate_stats_process_rooms_fix.sql b/synapse/storage/schema/main/delta/58/16populate_stats_process_rooms_fix.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/16populate_stats_process_rooms_fix.sql
rename to synapse/storage/schema/main/delta/58/16populate_stats_process_rooms_fix.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/17_catchup_last_successful.sql b/synapse/storage/schema/main/delta/58/17_catchup_last_successful.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/17_catchup_last_successful.sql
rename to synapse/storage/schema/main/delta/58/17_catchup_last_successful.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/18stream_positions.sql b/synapse/storage/schema/main/delta/58/18stream_positions.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/18stream_positions.sql
rename to synapse/storage/schema/main/delta/58/18stream_positions.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/19instance_map.sql.postgres b/synapse/storage/schema/main/delta/58/19instance_map.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/19instance_map.sql.postgres
rename to synapse/storage/schema/main/delta/58/19instance_map.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/58/19txn_id.sql b/synapse/storage/schema/main/delta/58/19txn_id.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/19txn_id.sql
rename to synapse/storage/schema/main/delta/58/19txn_id.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/20instance_name_event_tables.sql b/synapse/storage/schema/main/delta/58/20instance_name_event_tables.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/20instance_name_event_tables.sql
rename to synapse/storage/schema/main/delta/58/20instance_name_event_tables.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/20user_daily_visits.sql b/synapse/storage/schema/main/delta/58/20user_daily_visits.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/20user_daily_visits.sql
rename to synapse/storage/schema/main/delta/58/20user_daily_visits.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql b/synapse/storage/schema/main/delta/58/21as_device_stream.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/21as_device_stream.sql
rename to synapse/storage/schema/main/delta/58/21as_device_stream.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/21drop_device_max_stream_id.sql b/synapse/storage/schema/main/delta/58/21drop_device_max_stream_id.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/21drop_device_max_stream_id.sql
rename to synapse/storage/schema/main/delta/58/21drop_device_max_stream_id.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/22puppet_token.sql b/synapse/storage/schema/main/delta/58/22puppet_token.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/22puppet_token.sql
rename to synapse/storage/schema/main/delta/58/22puppet_token.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/22users_have_local_media.sql b/synapse/storage/schema/main/delta/58/22users_have_local_media.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/22users_have_local_media.sql
rename to synapse/storage/schema/main/delta/58/22users_have_local_media.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/23e2e_cross_signing_keys_idx.sql b/synapse/storage/schema/main/delta/58/23e2e_cross_signing_keys_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/23e2e_cross_signing_keys_idx.sql
rename to synapse/storage/schema/main/delta/58/23e2e_cross_signing_keys_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/24drop_event_json_index.sql b/synapse/storage/schema/main/delta/58/24drop_event_json_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/24drop_event_json_index.sql
rename to synapse/storage/schema/main/delta/58/24drop_event_json_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/25user_external_ids_user_id_idx.sql b/synapse/storage/schema/main/delta/58/25user_external_ids_user_id_idx.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/25user_external_ids_user_id_idx.sql
rename to synapse/storage/schema/main/delta/58/25user_external_ids_user_id_idx.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/26access_token_last_validated.sql b/synapse/storage/schema/main/delta/58/26access_token_last_validated.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/26access_token_last_validated.sql
rename to synapse/storage/schema/main/delta/58/26access_token_last_validated.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/27local_invites.sql b/synapse/storage/schema/main/delta/58/27local_invites.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/27local_invites.sql
rename to synapse/storage/schema/main/delta/58/27local_invites.sql
diff --git a/synapse/storage/databases/main/schema/delta/58/28drop_last_used_column.sql.postgres b/synapse/storage/schema/main/delta/58/28drop_last_used_column.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/28drop_last_used_column.sql.postgres
rename to synapse/storage/schema/main/delta/58/28drop_last_used_column.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/58/28drop_last_used_column.sql.sqlite b/synapse/storage/schema/main/delta/58/28drop_last_used_column.sql.sqlite
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/58/28drop_last_used_column.sql.sqlite
rename to synapse/storage/schema/main/delta/58/28drop_last_used_column.sql.sqlite
diff --git a/synapse/storage/databases/main/schema/delta/59/01ignored_user.py b/synapse/storage/schema/main/delta/59/01ignored_user.py
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/01ignored_user.py
rename to synapse/storage/schema/main/delta/59/01ignored_user.py
diff --git a/synapse/storage/databases/main/schema/delta/59/02shard_send_to_device.sql b/synapse/storage/schema/main/delta/59/02shard_send_to_device.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/02shard_send_to_device.sql
rename to synapse/storage/schema/main/delta/59/02shard_send_to_device.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/03shard_send_to_device_sequence.sql.postgres b/synapse/storage/schema/main/delta/59/03shard_send_to_device_sequence.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/03shard_send_to_device_sequence.sql.postgres
rename to synapse/storage/schema/main/delta/59/03shard_send_to_device_sequence.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/59/04_event_auth_chains.sql b/synapse/storage/schema/main/delta/59/04_event_auth_chains.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/04_event_auth_chains.sql
rename to synapse/storage/schema/main/delta/59/04_event_auth_chains.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/04_event_auth_chains.sql.postgres b/synapse/storage/schema/main/delta/59/04_event_auth_chains.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/04_event_auth_chains.sql.postgres
rename to synapse/storage/schema/main/delta/59/04_event_auth_chains.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/59/04drop_account_data.sql b/synapse/storage/schema/main/delta/59/04drop_account_data.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/04drop_account_data.sql
rename to synapse/storage/schema/main/delta/59/04drop_account_data.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/05cache_invalidation.sql b/synapse/storage/schema/main/delta/59/05cache_invalidation.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/05cache_invalidation.sql
rename to synapse/storage/schema/main/delta/59/05cache_invalidation.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/06chain_cover_index.sql b/synapse/storage/schema/main/delta/59/06chain_cover_index.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/06chain_cover_index.sql
rename to synapse/storage/schema/main/delta/59/06chain_cover_index.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/06shard_account_data.sql b/synapse/storage/schema/main/delta/59/06shard_account_data.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/06shard_account_data.sql
rename to synapse/storage/schema/main/delta/59/06shard_account_data.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/06shard_account_data.sql.postgres b/synapse/storage/schema/main/delta/59/06shard_account_data.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/06shard_account_data.sql.postgres
rename to synapse/storage/schema/main/delta/59/06shard_account_data.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/59/07shard_account_data_fix.sql b/synapse/storage/schema/main/delta/59/07shard_account_data_fix.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/07shard_account_data_fix.sql
rename to synapse/storage/schema/main/delta/59/07shard_account_data_fix.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/08delete_pushers_for_deactivated_accounts.sql b/synapse/storage/schema/main/delta/59/08delete_pushers_for_deactivated_accounts.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/08delete_pushers_for_deactivated_accounts.sql
rename to synapse/storage/schema/main/delta/59/08delete_pushers_for_deactivated_accounts.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/08delete_stale_pushers.sql b/synapse/storage/schema/main/delta/59/08delete_stale_pushers.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/08delete_stale_pushers.sql
rename to synapse/storage/schema/main/delta/59/08delete_stale_pushers.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/09rejected_events_metadata.sql b/synapse/storage/schema/main/delta/59/09rejected_events_metadata.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/09rejected_events_metadata.sql
rename to synapse/storage/schema/main/delta/59/09rejected_events_metadata.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/10delete_purged_chain_cover.sql b/synapse/storage/schema/main/delta/59/10delete_purged_chain_cover.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/10delete_purged_chain_cover.sql
rename to synapse/storage/schema/main/delta/59/10delete_purged_chain_cover.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/11drop_thumbnail_constraint.sql.postgres b/synapse/storage/schema/main/delta/59/11drop_thumbnail_constraint.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/11drop_thumbnail_constraint.sql.postgres
rename to synapse/storage/schema/main/delta/59/11drop_thumbnail_constraint.sql.postgres
diff --git a/synapse/storage/databases/main/schema/delta/59/12account_validity_token_used_ts_ms.sql b/synapse/storage/schema/main/delta/59/12account_validity_token_used_ts_ms.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/12account_validity_token_used_ts_ms.sql
rename to synapse/storage/schema/main/delta/59/12account_validity_token_used_ts_ms.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/12presence_stream_instance.sql b/synapse/storage/schema/main/delta/59/12presence_stream_instance.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/12presence_stream_instance.sql
rename to synapse/storage/schema/main/delta/59/12presence_stream_instance.sql
diff --git a/synapse/storage/databases/main/schema/delta/59/12presence_stream_instance_seq.sql.postgres b/synapse/storage/schema/main/delta/59/12presence_stream_instance_seq.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/delta/59/12presence_stream_instance_seq.sql.postgres
rename to synapse/storage/schema/main/delta/59/12presence_stream_instance_seq.sql.postgres
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/application_services.sql b/synapse/storage/schema/main/full_schemas/16/application_services.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/application_services.sql
rename to synapse/storage/schema/main/full_schemas/16/application_services.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/event_edges.sql b/synapse/storage/schema/main/full_schemas/16/event_edges.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/event_edges.sql
rename to synapse/storage/schema/main/full_schemas/16/event_edges.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/event_signatures.sql b/synapse/storage/schema/main/full_schemas/16/event_signatures.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/event_signatures.sql
rename to synapse/storage/schema/main/full_schemas/16/event_signatures.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/im.sql b/synapse/storage/schema/main/full_schemas/16/im.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/im.sql
rename to synapse/storage/schema/main/full_schemas/16/im.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/keys.sql b/synapse/storage/schema/main/full_schemas/16/keys.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/keys.sql
rename to synapse/storage/schema/main/full_schemas/16/keys.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/media_repository.sql b/synapse/storage/schema/main/full_schemas/16/media_repository.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/media_repository.sql
rename to synapse/storage/schema/main/full_schemas/16/media_repository.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/presence.sql b/synapse/storage/schema/main/full_schemas/16/presence.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/presence.sql
rename to synapse/storage/schema/main/full_schemas/16/presence.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/profiles.sql b/synapse/storage/schema/main/full_schemas/16/profiles.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/profiles.sql
rename to synapse/storage/schema/main/full_schemas/16/profiles.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/push.sql b/synapse/storage/schema/main/full_schemas/16/push.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/push.sql
rename to synapse/storage/schema/main/full_schemas/16/push.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/redactions.sql b/synapse/storage/schema/main/full_schemas/16/redactions.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/redactions.sql
rename to synapse/storage/schema/main/full_schemas/16/redactions.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/room_aliases.sql b/synapse/storage/schema/main/full_schemas/16/room_aliases.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/room_aliases.sql
rename to synapse/storage/schema/main/full_schemas/16/room_aliases.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/state.sql b/synapse/storage/schema/main/full_schemas/16/state.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/state.sql
rename to synapse/storage/schema/main/full_schemas/16/state.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/transactions.sql b/synapse/storage/schema/main/full_schemas/16/transactions.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/transactions.sql
rename to synapse/storage/schema/main/full_schemas/16/transactions.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/16/users.sql b/synapse/storage/schema/main/full_schemas/16/users.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/16/users.sql
rename to synapse/storage/schema/main/full_schemas/16/users.sql
diff --git a/synapse/storage/databases/main/schema/full_schemas/54/full.sql.postgres b/synapse/storage/schema/main/full_schemas/54/full.sql.postgres
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/54/full.sql.postgres
rename to synapse/storage/schema/main/full_schemas/54/full.sql.postgres
diff --git a/synapse/storage/databases/main/schema/full_schemas/54/full.sql.sqlite b/synapse/storage/schema/main/full_schemas/54/full.sql.sqlite
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/54/full.sql.sqlite
rename to synapse/storage/schema/main/full_schemas/54/full.sql.sqlite
diff --git a/synapse/storage/databases/main/schema/full_schemas/54/stream_positions.sql b/synapse/storage/schema/main/full_schemas/54/stream_positions.sql
similarity index 100%
rename from synapse/storage/databases/main/schema/full_schemas/54/stream_positions.sql
rename to synapse/storage/schema/main/full_schemas/54/stream_positions.sql
diff --git a/synapse/storage/databases/state/schema/delta/23/drop_state_index.sql b/synapse/storage/schema/state/delta/23/drop_state_index.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/23/drop_state_index.sql
rename to synapse/storage/schema/state/delta/23/drop_state_index.sql
diff --git a/synapse/storage/databases/state/schema/delta/30/state_stream.sql b/synapse/storage/schema/state/delta/30/state_stream.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/30/state_stream.sql
rename to synapse/storage/schema/state/delta/30/state_stream.sql
diff --git a/synapse/storage/databases/state/schema/delta/32/remove_state_indices.sql b/synapse/storage/schema/state/delta/32/remove_state_indices.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/32/remove_state_indices.sql
rename to synapse/storage/schema/state/delta/32/remove_state_indices.sql
diff --git a/synapse/storage/databases/state/schema/delta/35/add_state_index.sql b/synapse/storage/schema/state/delta/35/add_state_index.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/35/add_state_index.sql
rename to synapse/storage/schema/state/delta/35/add_state_index.sql
diff --git a/synapse/storage/databases/state/schema/delta/35/state.sql b/synapse/storage/schema/state/delta/35/state.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/35/state.sql
rename to synapse/storage/schema/state/delta/35/state.sql
diff --git a/synapse/storage/databases/state/schema/delta/35/state_dedupe.sql b/synapse/storage/schema/state/delta/35/state_dedupe.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/35/state_dedupe.sql
rename to synapse/storage/schema/state/delta/35/state_dedupe.sql
diff --git a/synapse/storage/databases/state/schema/delta/47/state_group_seq.py b/synapse/storage/schema/state/delta/47/state_group_seq.py
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/47/state_group_seq.py
rename to synapse/storage/schema/state/delta/47/state_group_seq.py
diff --git a/synapse/storage/databases/state/schema/delta/56/state_group_room_idx.sql b/synapse/storage/schema/state/delta/56/state_group_room_idx.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/delta/56/state_group_room_idx.sql
rename to synapse/storage/schema/state/delta/56/state_group_room_idx.sql
diff --git a/synapse/storage/databases/state/schema/full_schemas/54/full.sql b/synapse/storage/schema/state/full_schemas/54/full.sql
similarity index 100%
rename from synapse/storage/databases/state/schema/full_schemas/54/full.sql
rename to synapse/storage/schema/state/full_schemas/54/full.sql
diff --git a/synapse/storage/databases/state/schema/full_schemas/54/sequence.sql.postgres b/synapse/storage/schema/state/full_schemas/54/sequence.sql.postgres
similarity index 100%
rename from synapse/storage/databases/state/schema/full_schemas/54/sequence.sql.postgres
rename to synapse/storage/schema/state/full_schemas/54/sequence.sql.postgres
diff --git a/tests/storage/test_cleanup_extrems.py b/tests/storage/test_cleanup_extrems.py
index aa20588bbe..77c4fe721c 100644
--- a/tests/storage/test_cleanup_extrems.py
+++ b/tests/storage/test_cleanup_extrems.py
@@ -47,10 +47,8 @@ class CleanupExtremBackgroundUpdateStoreTestCase(HomeserverTestCase):
         )
 
         schema_path = os.path.join(
-            prepare_database.dir_path,
-            "databases",
+            prepare_database.schema_path,
             "main",
-            "schema",
             "delta",
             "54",
             "delete_forward_extremities.sql",