Simplify folders structure
Update README.md