Tweaked packaging files, cleaned up some more.