Reworking PyPi.