make import more general
move import to reflect its new name