Reorganize leader mappings