Importer refactor

Merge of first round of importer refactorings with @motasem-salem work effectively merging #140 and #149.
Just to make sure I'm still on the same page: is the ultimate plan to eliminate these validations and let the Orphan model handle them?