rearranged repo, added header files to cmake build, minor source fixes