Improved Makefile: manifest / dir