some Immutables.generator template restructuring