Add the old Makefile targets back in

This makes it easier to upgrade the code and the package structure separately.