Moved templates into directories grouped by function
Merge branch 'template-reorganize' into develop