Revert "Calendar modularization again with unit test fixes"

This reverts commit 6bed81614b5522d84c91d6b607e3d2ef0ee3229b.
Bug 1023664 - Calendar modularization again with unit test fixes r=mmedeiros