update templates for layout, regenerated java classes