Re-org for PYPI upload.