gonze fixes reorganisation code