InstData Import: pull out retrieve file methods into separate modules

Fixed