beginning of file list refactoring