Update Makefile to better handle directories