Calendar modularization 3