Improves documentation of calendar modules.

Gives calendar modules a more explicit heirarchy and indents them accordingly.
Merge branch 'grid-system-fixing'