made some cleanup -- moved function_importer to utils