Added base of allow subfolders feature