FileView refactoring