Refactoring.
Update README and CHANGES.