Updated and reordered the README