Updated CMakeLists.txt for new classes