Modified Makefile to be more elegant and with output dir