Reworked Makefile
integrating stuff