Importer refactor

Merge of first round of importer refactorings with @motasem-salem work effectively merging #140 and #149.
something to lean back on but I'll take it out now.