Refactor Calendar objects into proper constructor objects