Some refactoring.
Correction of the warnings. Non more warnings (!!!)
One last remaining warning.
Correct errors in CMakeLists.txt, Rename a file.