Refactoriced importer module as stated on #6 and changed all the calls accordingly