added submodules, and fixed makefile