Start of Refactoring of the Calendar Manager
Further calendar package refactoring
Next step of refactoring
Next step of calendar package refactoring
next step
finish?
Testing finished
Merge branch 'CalendarRefactoringTL'