Updated CMakeLists files