WIP
Refactor code to split Parsing and Calendar Classes out into modules