update and organize build.xml