CAL-156 restructure calendar list