Altered the entity decoding api to handle the new HttpMessage objects. Removed all redundant classes.