Move OrderCreator to OrderFactory