adjust Makefile to new directory structure