update Makefile wrt latest source code reorg