Renama. Cleanup.
Update README.