Re-organize the files and add more info to README