Change directory structure
Fix README.md