Rearrange GuardianContentClient for clarity