diff --git a/functional-tests/tests/bridge_deposit_happy.py b/functional-tests/tests/bridge/bridge_deposit_happy.py
similarity index 100%
rename from functional-tests/tests/bridge_deposit_happy.py
rename to functional-tests/tests/bridge/bridge_deposit_happy.py
diff --git a/functional-tests/tests/bridge_deposit_reclaim.py b/functional-tests/tests/bridge/bridge_deposit_reclaim.py
similarity index 100%
rename from functional-tests/tests/bridge_deposit_reclaim.py
rename to functional-tests/tests/bridge/bridge_deposit_reclaim.py
diff --git a/functional-tests/tests/bridge_deposit_reclaim_drt_seen.py b/functional-tests/tests/bridge/bridge_deposit_reclaim_drt_seen.py
similarity index 100%
rename from functional-tests/tests/bridge_deposit_reclaim_drt_seen.py
rename to functional-tests/tests/bridge/bridge_deposit_reclaim_drt_seen.py
diff --git a/functional-tests/tests/fn_bridge_deposit_seq_unreliable.py b/functional-tests/tests/bridge/bridge_deposit_seq_unreliable.py
similarity index 100%
rename from functional-tests/tests/fn_bridge_deposit_seq_unreliable.py
rename to functional-tests/tests/bridge/bridge_deposit_seq_unreliable.py
diff --git a/functional-tests/tests/bridge_duties.py b/functional-tests/tests/bridge/bridge_duties.py
similarity index 100%
rename from functional-tests/tests/bridge_duties.py
rename to functional-tests/tests/bridge/bridge_duties.py
diff --git a/functional-tests/tests/bridge_reassignment.py b/functional-tests/tests/bridge/bridge_reassignment.py
similarity index 100%
rename from functional-tests/tests/bridge_reassignment.py
rename to functional-tests/tests/bridge/bridge_reassignment.py
diff --git a/functional-tests/tests/bridge_withdraw_happy.py b/functional-tests/tests/bridge/bridge_withdraw_happy.py
similarity index 100%
rename from functional-tests/tests/bridge_withdraw_happy.py
rename to functional-tests/tests/bridge/bridge_withdraw_happy.py
diff --git a/functional-tests/tests/btcio_broadcast.py b/functional-tests/tests/btcio/btcio_broadcast.py
similarity index 100%
rename from functional-tests/tests/btcio_broadcast.py
rename to functional-tests/tests/btcio/btcio_broadcast.py
diff --git a/functional-tests/tests/btcio_connect.py b/functional-tests/tests/btcio/btcio_connect.py
similarity index 100%
rename from functional-tests/tests/btcio_connect.py
rename to functional-tests/tests/btcio/btcio_connect.py
diff --git a/functional-tests/tests/btcio_inscriber.py b/functional-tests/tests/btcio/btcio_inscriber.py
similarity index 100%
rename from functional-tests/tests/btcio_inscriber.py
rename to functional-tests/tests/btcio/btcio_inscriber.py
diff --git a/functional-tests/tests/btcio_read.py b/functional-tests/tests/btcio/btcio_read.py
similarity index 100%
rename from functional-tests/tests/btcio_read.py
rename to functional-tests/tests/btcio/btcio_read.py
diff --git a/functional-tests/tests/btcio_read_reorg.py b/functional-tests/tests/btcio/btcio_read_reorg.py
similarity index 100%
rename from functional-tests/tests/btcio_read_reorg.py
rename to functional-tests/tests/btcio/btcio_read_reorg.py
diff --git a/functional-tests/tests/btcio_resubmit_checkpoint.py b/functional-tests/tests/btcio/btcio_resubmit_checkpoint.py
similarity index 100%
rename from functional-tests/tests/btcio_resubmit_checkpoint.py
rename to functional-tests/tests/btcio/btcio_resubmit_checkpoint.py
diff --git a/functional-tests/tests/prover_checkpoint_latest.py b/functional-tests/tests/prover/prover_checkpoint_latest.py
similarity index 100%
rename from functional-tests/tests/prover_checkpoint_latest.py
rename to functional-tests/tests/prover/prover_checkpoint_latest.py
diff --git a/functional-tests/tests/prover_checkpoint_manual.py b/functional-tests/tests/prover/prover_checkpoint_manual.py
similarity index 100%
rename from functional-tests/tests/prover_checkpoint_manual.py
rename to functional-tests/tests/prover/prover_checkpoint_manual.py
diff --git a/functional-tests/tests/prover_cl_batch_dispatch.py b/functional-tests/tests/prover/prover_cl_batch_dispatch.py
similarity index 100%
rename from functional-tests/tests/prover_cl_batch_dispatch.py
rename to functional-tests/tests/prover/prover_cl_batch_dispatch.py
diff --git a/functional-tests/tests/prover_cl_dispatch.py b/functional-tests/tests/prover/prover_cl_dispatch.py
similarity index 100%
rename from functional-tests/tests/prover_cl_dispatch.py
rename to functional-tests/tests/prover/prover_cl_dispatch.py
diff --git a/functional-tests/tests/prover_el_deposit_withdraw.py b/functional-tests/tests/prover/prover_el_deposit_withdraw.py
similarity index 100%
rename from functional-tests/tests/prover_el_deposit_withdraw.py
rename to functional-tests/tests/prover/prover_el_deposit_withdraw.py
diff --git a/functional-tests/tests/prover_el_dispatch.py b/functional-tests/tests/prover/prover_el_dispatch.py
similarity index 100%
rename from functional-tests/tests/prover_el_dispatch.py
rename to functional-tests/tests/prover/prover_el_dispatch.py
diff --git a/functional-tests/tests/prover_l1_batch_dispatch.py b/functional-tests/tests/prover/prover_l1_batch_dispatch.py
similarity index 100%
rename from functional-tests/tests/prover_l1_batch_dispatch.py
rename to functional-tests/tests/prover/prover_l1_batch_dispatch.py
diff --git a/functional-tests/tests/prover_l1_dispatch.py b/functional-tests/tests/prover/prover_l1_dispatch.py
similarity index 100%
rename from functional-tests/tests/prover_l1_dispatch.py
rename to functional-tests/tests/prover/prover_l1_dispatch.py
diff --git a/functional-tests/tests/sync_bitcoin_reorg.py b/functional-tests/tests/sync/sync_bitcoin_reorg.py
similarity index 100%
rename from functional-tests/tests/sync_bitcoin_reorg.py
rename to functional-tests/tests/sync/sync_bitcoin_reorg.py
diff --git a/functional-tests/tests/sync_from_rpc.py b/functional-tests/tests/sync/sync_from_rpc.py
similarity index 100%
rename from functional-tests/tests/sync_from_rpc.py
rename to functional-tests/tests/sync/sync_from_rpc.py
diff --git a/functional-tests/tests/sync_genesis.py b/functional-tests/tests/sync/sync_genesis.py
similarity index 100%
rename from functional-tests/tests/sync_genesis.py
rename to functional-tests/tests/sync/sync_genesis.py
diff --git a/functional-tests/tests/sync_genesis_with_btcblocks.py b/functional-tests/tests/sync/sync_genesis_with_btcblocks.py
similarity index 100%
rename from functional-tests/tests/sync_genesis_with_btcblocks.py
rename to functional-tests/tests/sync/sync_genesis_with_btcblocks.py
diff --git a/functional-tests/tests/sync_l1_finalization.py b/functional-tests/tests/sync/sync_l1_finalization.py
similarity index 100%
rename from functional-tests/tests/sync_l1_finalization.py
rename to functional-tests/tests/sync/sync_l1_finalization.py
diff --git a/functional-tests/tests/sync_l1_finalization_timeout.py b/functional-tests/tests/sync/sync_l1_finalization_timeout.py
similarity index 100%
rename from functional-tests/tests/sync_l1_finalization_timeout.py
rename to functional-tests/tests/sync/sync_l1_finalization_timeout.py