Added a bit of documentation to templates
Reorganized a bit