Major refactoring of calendar class, commenting and file name changes
Adds more comments and refactoring