Updated makefile structure