updated CMakeLists.txt to reflect the new directory structure.