Refactor Makefile package target