Moving source_capture to file, reordering and de-duping predicate mappings, fixing collection relationships