refactor fileset usage