Refactored asmt/cr/audit pojos so they center around the diag instances
instead of the higher level grouping