More Calendars! ver. 1.7

In this update, I start integrating the Calendar code with the rest of
the app. Moving it to the correct package and adding it to the
DataGatherer.