OrderItem class is now static-inner of Order; Changed signature of OrderBuilder.addOrderItem(OrderItem) to addOrderItem(Product, int);