Updated Shipper
Added basic pojo classes