Updated makefile to make better use of bin/