Move some stuff around for pypi