Lots of refactoring in the Java code; not sure how to proceed with client integration. Also removed guestbook sample code.