Update Makefile to be more modulate