Importer refactor

Merge of first round of importer refactorings with @motasem-salem work effectively merging #140 and #149.
In that case I think a lot of our code needs REFACTO :smile: