Updated makefile for current directory structure