Further calendar package refactoring