Modified Makefile structure