fix makefile for new dir structure