all CMakeLists.txt updated with corrected names and directories