Update CMakeLists.txt and other files