Add some packaging and some more cleanup.