(Filebrowser) Refactor