Update and reorganize README