(refact) templates: Delete deprecated files; clean up source code
Merge pull request #83 from alexanderGugel/refact/templates

(refact) templates: Delete deprecated files; clean up source code