Move shipment endpoints to a separate service class
Rename service files