Importer refactor

Merge of first round of importer refactorings with @motasem-salem work effectively merging #140 and #149.
L9 & L6: Why the change to a single value?