update Readme file and reorganized the folder naming convention.