Replaced CMake and package.xml