reorganize for multiple HSKs