expand class hierarchy because horror; update templates
Signed-off-by: Luca Filipozzi <lfilipoz@emyr.net>