Split OrderInfo class into own file