Fix documentation errors.
general restructure