adjusted makefile for new directory structure