Moves away from packing code towards using streams
Makefile updates and cleanup