adpapt old makefile to new file organization