Move xml-apis to its right (?) location