This includes the calendar/contacts prefix in the storage name as well as the pair name to ensure that if the same name is used for contacts and calendar then it is correctly referenced.
This adds a pimsync module using the rather verbose but feature-complete new SCFG generator.