package.xml and CMakeLists.txt updated