changing imports for new lib