Update CMakeLists for new layout