refactor(affinity manager) refactor to extend api manager

I think we should either consider changing the REST API response to not include underscores (+1) or update our application layer to use the properties as they are returned. The internal mapping layer feels messy and makes debugging more difficult. Can we remove the underscores from the response? They feel extraneous especially since they are applied to all values.