Split client & analysis, as has been done in the upstream repository.