Refactored xml files - change names and moved things arround