Fix build.xml structure