New structure, getting ready for PyPI