put import_base and mapper files in a separate module
update deps
[IMP] improve imporing to files