Reformat and reorder README