Organizing the templates in each folder
Merge branch 'master' of github.com:jmolinaso/templates