Resorted the structure