reorganizing templates
Merge pull request #2 from moliri/master

reorganizing templates