Reorganize chhiggs json files