Update ReadMe.
More refactoring.