reorganizing templates
Changing parser infra and template output (unfortunatly ST refuses to inherit dictionaries)