Added functionality of subfolder and files in subfolders