Update reporters.
Update CLI and self-report for new structure.