New template structure

No comment
I find it slightly confusing that we have so many template.xml files now - only speaking about the naming here...
Maybe the template root xml could be called template_base.xml and the protocol specific ones template_protocol.xml? 
Not really sure on the best approach here.