Modified Makefile to use new directory structure