Move template to separate file
Add generated annotation
move builderMethod to separate group