Cleanup lots of build stuff

Lots of packaging cleanups