Eng 5502 client java6

Last changes needed to isolate client code. Still needs an Ant script.

Don't merge until tests pass.