Advanced Makefile, structure changed