updated Makefile structure