Moving things back to the original location.
Cleaning up build.xml changes