Folder renaming and README.md update