Makefile actually works now with new directories