Better organization of XML files