Making more comprehensible

Group templates.

Change-Id: I03e59804431adc781a5b1561e7d8c5c318f50542