Minor refactoring - mostly to download features.

Added support for xcal and jcal.