Full consolidation of readme, website and docs

Some semantic changes.