Extract ChurchReport and CSVGenerator for reports.
Fix up zips/postcodes in preparation for unifying them.