sebkinne Cleanup: Sort payloads by category