Migrated dependency to submodule and fixed Makefile