Organize packages
Update README.md