wip
File structure in template changed - this closes #25
Merge branch 'master' into startup_errors