CMakeFiles refactoring