File browsing refactoring