Some restructuring and improvements to OSIS importer