Importer refactor

Merge of first round of importer refactorings with @motasem-salem work effectively merging #140 and #149.
no because we are overriding the method in such a way that a call to super wouldn't work.
This may well disappear in future refactorings if we start leaning more heavily on orphan model validation.