fixing links in readme.
some additional reorganization.