Next step of calendar package refactoring