Importer refactor

Merge of first round of importer refactorings with @motasem-salem work effectively merging #140 and #149.
yes but I have now clarified this in the comment line