#6 Renamed "template" with "layout" in some places

to differentiate between the whole template directory and Twig layouts