Collect files function coded from scratch
Minor design updares, date check for files