reorganize HSCP package