mv files, and modified CMakeLists.txt