Minor improvements to the Makefile and moved it to project root