adapt old makefile to new file organization