Makefile expanded to cover sub directories