WIP Moving XML to a top level folder.