Reorganize hash spec