Moved directories and modified CMakeLists.txt