Refactor the Makefile's a bit