update CMakeLists fix for new folder structure