Changed regex and improved output for old file name schema; Added mock files for old file name schema