Bug 1023664 - Calendar modularization part 1