restruct for PyPI