Importer refactor

Merge of first round of importer refactorings with @motasem-salem work effectively merging #140 and #149.
Should this be a call to the accessor, for the sake of consistency and ease of possible future changes?