update makefile for the new submodule organization