Various changes
"Refactor" CMakeLists.txt