Makefile structure revision