add xml and reorginize