Simplify sending logic in importers
No need in keeping this around at this level
Cleaner packaging (refactor import classes)