Moved files up in the CMakeLists.txt