Cleanup and organization for PyPI release