Added template support in folders