Refactored Makefile variables, added packaging targets.