Rewrite Java Guide based on new framework guide structure