Feature/fix template path

Also merge in a fix on the template paths