Calendar modularization r=millermedeiros