update class definitions to correspond with Guzzle 3 structure