[cvs-nhc98] Some re-organisation and improvement to docs.