Reworked Makefile