Match Fitbit API wrapper more closely to Fitbit API structure