Updating Makefile to work with new directory structure