Clean-up of CMakeList.txt files

To simplify both the presentation and the procedure.