Updated to fix for the movement of classes around.
Modified to package names, build.xml b.c. the classes were moved around.