Improve packing + Makefile