Refactoring for installing from pypi.