Reorganizing and fixing links in Readme