Refactored orders and shippings