Changed CMake structure