FileSeparation class redesign & bug fix