Added folders and subfolders