Start refactoring out file browser