Reorganize and add more xmls