Added missing files
Cmake cleanup