Change directory structure
Update README.md according to last commit