remove submodule, include header file
move headers to include directory, and modify makefile