Added code to discover shredded files. Some simplification