Add new version of report; rearrange docs