New template structure

No comment
Hmm, we really should generate this...