Make Authenticator internal to Calendar, reformat