Packaging cleanup

Packaging cleanup and testing in preparation for uploading to PyPI