Cleaned up package.xml and CMakeLists.txt