Improved Makefile, using git sub-modules now