Update and rename shipment.java to Shipment.java