Better packaging and can package from Makefile