replace / merged timber functions.php
aadded _s inc folder and files