Templates in subfolders will now be included