Cmake / Project refactor