Refactored rebranding xml files