Moved shipment view entities to separate file