new xml files and code reorder