Update README.md and folder structure