Cleaned up package.xml files
cleaned up CMakeLists