Fix submodule and Makefile paths according to update project structure.