Updated README; general renaming and reformatting