+ Fixed template & JS logic for subfolders