Updated Makefile for new submodules