Generalise importers: finally move importers to own file