Added deletion of old folders to allow pick-up at any point of the reque...

...st