Updated readme.
Some class rearrangement.