Removed redundancy from package names: mantle.shipment.shipment to mantle.shipment and mantle.order.order to mantle.order