CMake structuring and changes