Better packaging, and ability to package from Makefile