Updated Makefile to use submodules, etc.