Big update
Move templates to a folder