restructure. Working on cmake include dirs