Re-organize

Update README
Re-organize folder structure.