restructure for PyPI upload