Further cleanup of architecture plus couple of new links.