Revert "reorganize for multiple HSKs"

This reverts commit f504040c5e0141933939a175ac735b397acd1633.
reorganize for multiple HSKs