Extracted classes to order-context modules