Generalise importers2 - prepare to move importers to own file