chenged the move_goldstone_to routine to a shuffle rather than a swap.
thus preserving mass ordering amongst physical states.
refactor move_goldstone_to