Decided to use the old build.xml, may change back later