delivery->shipment  - change naming.
Check shipment functionality creation. Refactoring.