fix up packaging and dependencies