Updated CMakeLists.txt to reflect changes in namespace and folder structure.