Modified directory structure in Makefile