beautify package xml and CMakeLists