Refactor all XMLs
Remove black Marsh temporarily