Moving more things to pip.