Rearrange directory structure
Update README.md