Re-organize & cleanup doc.