fixed xml and Cmakelists files