Build.xml revamped