Rearrange for pypi