Furtther work on Folder Scanning