Merge pull request #18 from evoskuil/master

Reorganize templates.