More Delivery Data Service work. Mostly cleaning up the JSON returned
More data service work. Refactored response objects to conform to JSON structure returned.