Adjusting some things for pypi package.