build.xml restructured.