Adding changes to build.xml, breaking into component files for easier flow