Bug 1023664 - Calendar modularization 2

Ok fair enough