Packaging cleanup to better match current conventions
Merge updated README