adjust makefile to new directory structure