adjustments to package.xml and CMakeLists.txt